cvs: php4 /main SAPI.c
| From: | Sascha Schumann | Date: | Wed, 15 Jan 2003 11:30:40 +0000 |
| Subject: | cvs: php4 /main SAPI.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17913@lists.php.net to get a copy of this message | ||
sas Wed Jan 15 06:30:40 2003 EDT
Modified files:
/php4/main SAPI.c
Log:
whitespace
Index: php4/main/SAPI.c
diff -u php4/main/SAPI.c:1.161 php4/main/SAPI.c:1.162
--- php4/main/SAPI.c:1.161 Tue Dec 31 10:58:51 2002
+++ php4/main/SAPI.c Wed Jan 15 06:30:39 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: SAPI.c,v 1.161 2002/12/31 15:58:51 sebastian Exp $ */
+/* $Id: SAPI.c,v 1.162 2003/01/15 11:30:39 sas Exp $ */
#include <ctype.h>
#include <sys/stat.h>
@@ -280,34 +280,34 @@
SAPI_API void sapi_activate_headers_only(TSRMLS_D)
{
- if (SG(request_info).headers_read == 1)
- return;
- SG(request_info).headers_read = 1;
- zend_llist_init(&SG(sapi_headers).headers, sizeof(sapi_header_struct), (void (*)(void *))
sapi_free_header, 0);
- SG(sapi_headers).send_default_content_type = 1;
-
- /*
- SG(sapi_headers).http_response_code = 200;
- */
- SG(sapi_headers).http_status_line = NULL;
- SG(request_info).current_user = NULL;
- SG(request_info).current_user_length = 0;
- SG(request_info).no_headers = 0;
-
- /* It's possible to override this general case in the activate() callback, if
- * necessary.
- */
- if (SG(request_info).request_method && !strcmp(SG(request_info).request_method,
"HEAD")) {
- SG(request_info).headers_only = 1;
- } else {
- SG(request_info).headers_only = 0;
- }
- if (SG(server_context)) {
- SG(request_info).cookie_data = sapi_module.read_cookies(TSRMLS_C);
- if (sapi_module.activate) {
- sapi_module.activate(TSRMLS_C);
- }
- }
+ if (SG(request_info).headers_read == 1)
+ return;
+ SG(request_info).headers_read = 1;
+ zend_llist_init(&SG(sapi_headers).headers, sizeof(sapi_header_struct),
+ (void (*)(void *)) sapi_free_header, 0);
+ SG(sapi_headers).send_default_content_type = 1;
+
+ /* SG(sapi_headers).http_response_code = 200; */
+ SG(sapi_headers).http_status_line = NULL;
+ SG(request_info).current_user = NULL;
+ SG(request_info).current_user_length = 0;
+ SG(request_info).no_headers = 0;
+
+ /*
+ * It's possible to override this general case in the activate() callback,
+ * if necessary.
+ */
+ if (SG(request_info).request_method && !strcmp(SG(request_info).request_method,
"HEAD")) {
+ SG(request_info).headers_only = 1;
+ } else {
+ SG(request_info).headers_only = 0;
+ }
+ if (SG(server_context)) {
+ SG(request_info).cookie_data = sapi_module.read_cookies(TSRMLS_C);
+ if (sapi_module.activate) {
+ sapi_module.activate(TSRMLS_C);
+ }
+ }
}
/*
@@ -423,9 +423,9 @@
SG(sapi_headers).mimetype = NULL;
}
sapi_send_headers_free(TSRMLS_C);
- SG(sapi_started) = 0;
- SG(headers_sent) = 0;
- SG(request_info).headers_read = 0;
+ SG(sapi_started) = 0;
+ SG(headers_sent) = 0;
+ SG(request_info).headers_read = 0;
}