[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c

[Michael Wallner]

mike            Sun Mar 19 14:54:54 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /php-src/sapi/apache2handler        sapi_apache2.c 
    /php-src/sapi/apache2filter sapi_apache2.c 
  Log:
  - fix php_apache_sapi_header_handler() modifying sapi_header
  # already taken care of in apcache1 sapi
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.9&r2=1.57.2.10&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.9 
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.9 Sun Jan  1 12:50:18 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c  Sun Mar 19 14:54:53 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.9 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10 2006/03/19 14:54:53 mike Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -86,7 +86,7 @@
 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 @@
                sapi_free_header(sapi_header);
                return 0;
        }
+       ptr = val;
 
        *val = '\0';
        
@@ -111,6 +112,7 @@
        } else {
                apr_table_add(ctx->r->headers_out, sapi_header->header, val);
        }
+       *ptr = ':';
        
        return SAPI_HEADER_ADD;
 }
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.136.2.1&r2=1.136.2.2&diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.1 
php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2
--- php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.1 Sun Jan  1 12:50:18 2006
+++ php-src/sapi/apache2filter/sapi_apache2.c   Sun Mar 19 14:54:53 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.136.2.1 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.136.2.2 2006/03/19 14:54:53 mike Exp $ */
 
 #include <fcntl.h>
 
@@ -103,7 +103,7 @@
 {
        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 @@
                sapi_free_header(sapi_header);
                return 0;
        }
+       ptr = val;
 
        *val = '\0';
        
@@ -128,6 +129,7 @@
        else
                apr_table_add(ctx->r->headers_out, sapi_header->header, val);
        
+       *ptr = ':';
        return SAPI_HEADER_ADD;
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php