dmitry Fri Feb 15 06:51:12 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap soap.c
Log:
Fixed bug #43507 (SOAPFault HTTP Status 500 - would like to be able to set
the HTTP Status)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.11&r2=1.156.2.28.2.30.2.12&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.11
php-src/ext/soap/soap.c:1.156.2.28.2.30.2.12
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.11 Wed Jan 16 06:15:04 2008
+++ php-src/ext/soap/soap.c Fri Feb 15 06:51:12 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.30.2.11 2008/01/16 06:15:04 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.12 2008/02/15 06:51:12 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2008,6 +2008,8 @@
char cont_len[30];
int size;
xmlDocPtr doc_return;
+ zval **agent_name;
+ int use_http_error_status = 1;
soap_version = SOAP_GLOBAL(soap_version);
@@ -2015,11 +2017,21 @@
xmlDocDumpMemory(doc_return, &buf, &size);
+ zend_is_auto_global("_SERVER", sizeof("_SERVER") - 1 TSRMLS_CC);
+ if (PG(http_globals)[TRACK_VARS_SERVER] &&
+ zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht,
"HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT"), (void **) &agent_name) == SUCCESS
&&
+ Z_TYPE_PP(agent_name) == IS_STRING) {
+ if (strncmp(Z_STRVAL_PP(agent_name), "Shockwave Flash",
sizeof("Shockwave Flash")-1) == 0) {
+ use_http_error_status = 0;
+ }
+ }
/*
Want to return HTTP 500 but apache wants to over write
our fault code with their own handling... Figure this out later
*/
- sapi_add_header("HTTP/1.1 500 Internal Service Error", sizeof("HTTP/1.1
500 Internal Service Error")-1, 1);
+ if (use_http_error_status) {
+ sapi_add_header("HTTP/1.1 500 Internal Service Error",
sizeof("HTTP/1.1 500 Internal Service Error")-1, 1);
+ }
if (soap_version == SOAP_1_2) {
sapi_add_header("Content-Type: application/soap+xml;
charset=utf-8", sizeof("Content-Type: application/soap+xml; charset=utf-8")-1,
1);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
