From 23b8ce3876019a0e05a23fd3831376c3d409b0d4 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Sun, 19 Mar 2006 14:54:53 +0000 Subject: [PATCH] - fix php_apache_sapi_header_handler() modifying sapi_header # already taken care of in apcache1 sapi --- sapi/apache2filter/sapi_apache2.c | 4 +++- sapi/apache2handler/sapi_apache2.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index 060a8fd685..ac778e7840 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -103,7 +103,7 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_str { php_struct *ctx; ap_filter_t *f; - char *val; + char *val, *ptr; ctx = SG(server_context); f = ctx->r->output_filters; @@ -114,6 +114,7 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_str sapi_free_header(sapi_header); return 0; } + ptr = val; *val = '\0'; @@ -128,6 +129,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); + *ptr = ':'; return SAPI_HEADER_ADD; } diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index ce120f3544..30e0458d3a 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -86,7 +86,7 @@ static int php_apache_sapi_header_handler(sapi_header_struct *sapi_header,sapi_headers_struct *sapi_headers TSRMLS_DC) { php_struct *ctx; - char *val; + char *val, *ptr; ctx = SG(server_context); @@ -96,6 +96,7 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header,sapi_headers_stru sapi_free_header(sapi_header); return 0; } + ptr = val; *val = '\0'; @@ -111,6 +112,7 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header,sapi_headers_stru } else { apr_table_add(ctx->r->headers_out, sapi_header->header, val); } + *ptr = ':'; return SAPI_HEADER_ADD; } -- 2.50.1