diff options
| author | Dmitry Stogov <dmitry@php.net> | 2008-02-15 06:51:12 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2008-02-15 06:51:12 +0000 |
| commit | 7b6238c61fd47d710b18ef6f3fff996f0e4b8fc1 (patch) | |
| tree | eec931df00d52f4d4d6c14e6624cdab11d2be474 /ext/soap | |
| parent | 0430464b1157355277562c058451be86398155cf (diff) | |
| download | php-git-7b6238c61fd47d710b18ef6f3fff996f0e4b8fc1.tar.gz | |
Fixed bug #43507 (SOAPFault HTTP Status 500 - would like to be able to set the HTTP Status)
Diffstat (limited to 'ext/soap')
| -rw-r--r-- | ext/soap/soap.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c index fb9209e762..42a23c8891 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -2008,6 +2008,8 @@ static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeade 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 @@ static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeade 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 { |