cvs: php4 /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c
| From: | Ilia Alshanetsky | Date: | Fri, 23 May 2003 02:41:59 +0000 |
| Subject: | cvs: php4 /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21218@lists.php.net to get a copy of this message | ||
iliaa Thu May 22 22:41:59 2003 EDT
Modified files:
/php4/sapi/apache2handler sapi_apache2.c
/php4/sapi/apache2filter sapi_apache2.c
Log:
Fixed bug #23759 (PHP doesn't preserve subrequest status).
(jaboydjr.netwalk@com, Ilia)
Index: php4/sapi/apache2handler/sapi_apache2.c
diff -u php4/sapi/apache2handler/sapi_apache2.c:1.19 php4/sapi/apache2handler/sapi_apache2.c:1.20
--- php4/sapi/apache2handler/sapi_apache2.c:1.19 Wed May 14 14:15:01 2003
+++ php4/sapi/apache2handler/sapi_apache2.c Thu May 22 22:41:59 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.19 2003/05/14 18:15:01 moriyoshi Exp $ */
+/* $Id: sapi_apache2.c,v 1.20 2003/05/23 02:41:59 iliaa Exp $ */
#include <fcntl.h>
@@ -407,7 +407,7 @@
char *content_type;
const char *auth;
- SG(sapi_headers).http_response_code = 200;
+ SG(sapi_headers).http_response_code = !r->status ? HTTP_OK : r->status;
SG(request_info).content_type = apr_table_get(r->headers_in, "Content-Type");
SG(request_info).query_string = apr_pstrdup(r->pool, r->args);
SG(request_info).request_method = r->method;
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.113 php4/sapi/apache2filter/sapi_apache2.c:1.114
--- php4/sapi/apache2filter/sapi_apache2.c:1.113 Wed May 14 14:15:01 2003
+++ php4/sapi/apache2filter/sapi_apache2.c Thu May 22 22:41:59 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.113 2003/05/14 18:15:01 moriyoshi Exp $ */
+/* $Id: sapi_apache2.c,v 1.114 2003/05/23 02:41:59 iliaa Exp $ */
#include <fcntl.h>
@@ -376,7 +376,7 @@
const char *auth;
PG(during_request_startup) = 0;
- SG(sapi_headers).http_response_code = 200;
+ SG(sapi_headers).http_response_code = !f->r->status ? HTTP_OK : f->r->status;
SG(request_info).content_type = apr_table_get(f->r->headers_in, "Content-Type");
#undef safe_strdup
#define safe_strdup(x) ((x)?strdup((x)):NULL)