summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2005-06-20 12:46:34 (GMT)
committerAntony Dovgal <tony2001@php.net>2005-06-20 12:46:34 (GMT)
commit8be61d707fbc1c819cd4eebb5d90b0a6d4aeaf97 (patch)
tree694f718b7e33800677d1736d082d038c8d40a82c /sapi
parent6f3b02cba430ce01150b6bb298158878ce633415 (diff)
downloadphp-8be61d707fbc1c819cd4eebb5d90b0a6d4aeaf97.tar.gz
fix #29683 (headers_list() returns empty array)
Diffstat (limited to 'sapi')
-rw-r--r--sapi/apache/mod_php5.c4
-rw-r--r--sapi/apache2filter/sapi_apache2.c4
-rw-r--r--sapi/apache2handler/sapi_apache2.c4
-rw-r--r--sapi/apache_hooks/mod_php5.c4
4 files changed, 4 insertions, 12 deletions
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 98c3d73..4148430 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -199,9 +199,7 @@ static int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_head
*p = ':'; /* a well behaved header handler shouldn't change its original arguments */
- efree(sapi_header->header);
-
- return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */
+ return SAPI_HEADER_ADD;
}
/* }}} */
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index f92fdad..6f92f7c 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -128,9 +128,7 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_str
else
apr_table_add(ctx->r->headers_out, sapi_header->header, val);
- sapi_free_header(sapi_header);
-
- return 0;
+ return SAPI_HEADER_ADD;
}
static int
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index d7f18f1..72b1813 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -112,9 +112,7 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header,sapi_headers_stru
apr_table_add(ctx->r->headers_out, sapi_header->header, val);
}
- sapi_free_header(sapi_header);
-
- return 0;
+ return SAPI_HEADER_ADD;
}
static int
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c
index 298e047..ebb4f8a 100644
--- a/sapi/apache_hooks/mod_php5.c
+++ b/sapi/apache_hooks/mod_php5.c
@@ -340,9 +340,7 @@ static int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_head
*p = ':'; /* a well behaved header handler shouldn't change its original arguments */
- efree(sapi_header->header);
-
- return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */
+ return SAPI_HEADER_ADD;
}
/* }}} */