- fix php_apache_sapi_header_handler() modifying sapi_header

# already taken care of in apcache1 sapi

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 060a8fd685a99327e87049d950b545038f40b779..ac778e7840ed210ed6676d133010134e94152f2a 100644 (file)
--- 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 ce120f3544602a19963a1e2f6b32103bd23e6bc7..30e0458d3a43449dda6d45ca047c7c50f8fc641e 100644 (file)
--- 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;
 }