[PHP-CVS] cvs: php4(apache_hooks) /sapi/apache php_apache.c

[George Schlossnagle]

gschlossnagle           Tue Oct  8 02:25:03 2002 EDT

  Modified files:              (Branch: apache_hooks)
    /php4/sapi/apache   php_apache.c 
  Log:
  header code cleanup
  
  
Index: php4/sapi/apache/php_apache.c
diff -u php4/sapi/apache/php_apache.c:1.45.4.7 php4/sapi/apache/php_apache.c:1.45.4.8
--- php4/sapi/apache/php_apache.c:1.45.4.7      Mon Oct  7 22:17:02 2002
+++ php4/sapi/apache/php_apache.c       Tue Oct  8 02:25:02 2002
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.45.4.7 2002/10/08 02:17:02 gschlossnagle Exp $ */
+/* $Id: php_apache.c,v 1.45.4.8 2002/10/08 06:25:02 gschlossnagle Exp $ */
 
 #include "php_apache_http.h"
 
@@ -968,6 +968,7 @@
         r->content_type = pstrdup(r->pool, type);
     }
     ap_send_http_header(r);
+    SG(headers_sent) = 1;
     AP(headers_sent) = 1;
     RETURN_TRUE;
 }
@@ -980,6 +981,7 @@
     APREQ_GET_REQUEST(id, r);
 
     ap_basic_http_header((request_rec *)SG(server_context));
+    SG(headers_sent) = 1;
     AP(headers_sent) = 1;
     RETURN_TRUE;
 }
@@ -992,6 +994,7 @@
     APREQ_GET_REQUEST(id, r);
 
     ap_send_http_trace((request_rec *)SG(server_context));
+    SG(headers_sent) = 1;
     AP(headers_sent) = 1;
     RETURN_TRUE;
 }
@@ -1004,6 +1007,7 @@
     APREQ_GET_REQUEST(id, r);
 
     ap_send_http_options((request_rec *)SG(server_context));
+    SG(headers_sent) = 1;
     AP(headers_sent) = 1;
     RETURN_TRUE;
 }
@@ -1270,6 +1274,7 @@
     APREQ_GET_REQUEST(id, r);
 
     ap_send_header_field(r, Z_STRVAL_PP(fieldname), Z_STRVAL_PP(fieldval));
+    SG(headers_sent) = 1;
     AP(headers_sent) = 1;
 }
 



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