[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug47049.phpt bug47049.wsdl
dmitry Wed Feb 18 13:25:32 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug47049.phpt bug47049.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #47049 (SoapClient::__soapCall causes a segmentation fault)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1424r2=1.2027.2.547.2.1425diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1424 php-src/NEWS:1.2027.2.547.2.1425
--- php-src/NEWS:1.2027.2.547.2.1424Tue Feb 17 17:09:24 2009
+++ php-src/NEWSWed Feb 18 13:25:31 2009
@@ -5,6 +5,8 @@
(Matt)
- Fixed bug #47399 (mb_check_encoding() returns true for some illegal SJIS
characters). (for-bugs at hnw dot jp, Moriyoshi)
+- Fixed bug #47049 (SoapClient::__soapCall causes a segmentation fault).
+ (Dmitry)
- Fixed bug #45940 (MySQLI OO does not populate connect_error property on
failed connect). (Johannes)
- Fixed bug #45923 (mb_st[r]ripos() offset not handled correctly). (Moriyoshi)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.43r2=1.156.2.28.2.44diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.43
php-src/ext/soap/soap.c:1.156.2.28.2.44
--- php-src/ext/soap/soap.c:1.156.2.28.2.43 Mon Feb 2 10:00:32 2009
+++ php-src/ext/soap/soap.c Wed Feb 18 13:25:32 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov dmi...@zend.com |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.43 2009/02/02 10:00:32 felipe Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.44 2009/02/18 13:25:32 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4187,7 +4187,17 @@
/*style = SOAP_RPC;*/
if (style == SOAP_RPC) {
ns = encode_add_ns(body, uri);
- method = xmlNewChild(body, ns, BAD_CAST(function_name),
NULL);
+ if (function_name) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function_name), NULL);
+ } else if (function function-requestName) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function-requestName), NULL);
+ } else if (function function-functionName) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function-functionName), NULL);
+ } else {
+ method = body;
+ }
+ } else {
+ method = body;
}
if (zend_hash_find(Z_OBJPROP_P(this_ptr), use, sizeof(use),
(void **)zuse) == SUCCESS
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug47049.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug47049.phpt
+++ php-src/ext/soap/tests/bugs/bug47049.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug47049.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug47049.wsdl
+++ php-src/ext/soap/tests/bugs/bug47049.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug46427.phpt
dmitry Thu Nov 27 11:25:23 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug46427.phpt
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #46427 (SoapClient() stumbles over its stream_context parameter)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1332r2=1.2027.2.547.2.1333diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1332 php-src/NEWS:1.2027.2.547.2.1333
--- php-src/NEWS:1.2027.2.547.2.1332Wed Nov 26 04:20:41 2008
+++ php-src/NEWSThu Nov 27 11:25:22 2008
@@ -9,6 +9,8 @@
inconsistent results). (Arnaud)
- Fixed bug #46626 (mb_convert_case does not handle apostrophe correctly).
(Ilia)
+- Fixed bug #46427 (SoapClient() stumbles over its stream_context parameter).
+ (Dmitry, Herman Radtke)
- Fixed bug #44182 (extract($a, EXTR_REFS) can fail to split copy-on-write
references). (robin_fernandes at uk dot ibm dot com)
- Fixed bug #44181 (extract($a, EXTR_OVERWRITE|EXTR_REFS) can fail to create
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.39r2=1.156.2.28.2.40diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.39
php-src/ext/soap/soap.c:1.156.2.28.2.40
--- php-src/ext/soap/soap.c:1.156.2.28.2.39 Tue Mar 4 12:23:10 2008
+++ php-src/ext/soap/soap.c Thu Nov 27 11:25:22 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.39 2008/03/04 12:23:10 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.40 2008/11/27 11:25:22 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2348,6 +2348,7 @@
if (zend_hash_find(ht, stream_context,
sizeof(stream_context), (void**)tmp) == SUCCESS
Z_TYPE_PP(tmp) == IS_RESOURCE) {
context = php_stream_context_from_zval(*tmp, 1);
+ zend_list_addref(context-rsrc_id);
}
if (zend_hash_find(ht, location, sizeof(location),
(void**)tmp) == SUCCESS
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug46427.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug46427.phpt
+++ php-src/ext/soap/tests/bugs/bug46427.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
dmitry Fri Feb 15 06:50:39 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/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/NEWS?r1=1.2027.2.547.2.1079r2=1.2027.2.547.2.1080diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1079 php-src/NEWS:1.2027.2.547.2.1080
--- php-src/NEWS:1.2027.2.547.2.1079Thu Feb 14 14:47:25 2008
+++ php-src/NEWSFri Feb 15 06:50:39 2008
@@ -50,6 +50,8 @@
timezone). (Derick)
- Fixed bug #43522 (stream_get_line() eats additional characters). (Felipe,
Ilia, Tony)
+- Fixed bug #43507 (SOAPFault HTTP Status 500 - would like to be able to set
+ the HTTP Status). (Dmitry)
- Fixed bug #43505 (Assign by reference bug). (Dmitry)
- Fixed bug #43497 (OCI8 XML/getClobVal aka temporary LOBs leak UGA memory).
(Chris)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.37r2=1.156.2.28.2.38diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.37
php-src/ext/soap/soap.c:1.156.2.28.2.38
--- php-src/ext/soap/soap.c:1.156.2.28.2.37 Wed Jan 16 06:14:45 2008
+++ php-src/ext/soap/soap.c Fri Feb 15 06:50:39 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.37 2008/01/16 06:14:45 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.38 2008/02/15 06:50:39 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2007,6 +2007,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);
@@ -2014,11 +2016,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
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug42692.phpt bug42692.wsdl
dmitry Tue Nov 13 15:10:05 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug42692.phpt bug42692.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1008r2=1.2027.2.547.2.1009diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1008 php-src/NEWS:1.2027.2.547.2.1009
--- php-src/NEWS:1.2027.2.547.2.1008Tue Nov 13 09:46:39 2007
+++ php-src/NEWSTue Nov 13 15:10:04 2007
@@ -12,6 +12,9 @@
- Fixed bug #42937 (__call() method not invoked when methods are called on
parent from child class). (Dmitry)
- Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
+- Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer).
+ (Dmitry)
+
08 Nov 2007, PHP 5.2.5
- Upgraded PCRE to version 7.3 (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.33r2=1.156.2.28.2.34diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.33
php-src/ext/soap/soap.c:1.156.2.28.2.34
--- php-src/ext/soap/soap.c:1.156.2.28.2.33 Thu Nov 1 15:41:13 2007
+++ php-src/ext/soap/soap.c Tue Nov 13 15:10:04 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.33 2007/11/01 15:41:13 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.34 2007/11/13 15:10:04 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4486,6 +4486,7 @@
break;
}
zend_hash_move_forward((*tmp)-requestParameters);
+ node = node-next;
}
if (ok /* node == NULL*/) {
return (*tmp);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42692.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug42692.phpt
+++ php-src/ext/soap/tests/bugs/bug42692.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42692.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug42692.wsdl
+++ php-src/ext/soap/tests/bugs/bug42692.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
dmitry Thu Nov 1 14:10:20 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #42773 (WSDL error causes HTTP 500 Response)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.993r2=1.2027.2.547.2.994diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.993 php-src/NEWS:1.2027.2.547.2.994
--- php-src/NEWS:1.2027.2.547.2.993 Wed Oct 31 13:23:05 2007
+++ php-src/NEWSThu Nov 1 14:10:18 2007
@@ -4,6 +4,7 @@
- Added ability to control memory consumption between request using
ZEND_MM_COMPACT environment variable. (Dmitry)
- Fixed bug #43137 (rmdir() and rename() do not clear statcache). (Jani)
+- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
18 Oct 2007, PHP 5.2.5RC1
- Upgraded PCRE to version 7.3 (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30r2=1.156.2.28.2.31diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30
php-src/ext/soap/soap.c:1.156.2.28.2.31
--- php-src/ext/soap/soap.c:1.156.2.28.2.30 Wed Sep 5 11:20:45 2007
+++ php-src/ext/soap/soap.c Thu Nov 1 14:10:19 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.30 2007/09/05 11:20:45 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.31 2007/11/01 14:10:19 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2039,13 +2039,14 @@
static void soap_error_handler(int error_num, const char *error_filename,
const uint error_lineno, const char *format, va_list args)
{
- zend_bool _old_in_compilation, _old_in_execution;
+ zend_bool _old_in_compilation, _old_in_execution, _old_headers_sent;
zend_execute_data *_old_current_execute_data;
TSRMLS_FETCH();
_old_in_compilation = CG(in_compilation);
_old_in_execution = EG(in_execution);
_old_current_execute_data = EG(current_execute_data);
+ _old_headers_sent = SG(headers_sent);
if (!SOAP_GLOBAL(use_soap_error_handler)) {
call_old_error_handler(error_num, error_filename, error_lineno,
format, args);
@@ -2103,12 +2104,14 @@
old_objects = EG(objects_store).object_buckets;
EG(objects_store).object_buckets = NULL;
PG(display_errors) = 0;
+ SG(headers_sent) = 1;
zend_try {
call_old_error_handler(error_num,
error_filename, error_lineno, format, args);
} zend_catch {
CG(in_compilation) = _old_in_compilation;
EG(in_execution) = _old_in_execution;
EG(current_execute_data) =
_old_current_execute_data;
+ SG(headers_sent) = _old_headers_sent;
} zend_end_try();
EG(objects_store).object_buckets = old_objects;
PG(display_errors) = old;
@@ -2181,12 +2184,14 @@
}
PG(display_errors) = 0;
+ SG(headers_sent) = 1;
zend_try {
call_old_error_handler(error_num, error_filename,
error_lineno, format, args);
} zend_catch {
CG(in_compilation) = _old_in_compilation;
EG(in_execution) = _old_in_execution;
EG(current_execute_data) = _old_current_execute_data;
+ SG(headers_sent) = _old_headers_sent;
} zend_end_try();
PG(display_errors) = old;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug42086.phpt bug42086.wsdl
dmitry Fri Aug 31 09:36:02 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug42086.phpt bug42086.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic
compliant wsdl)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.918r2=1.2027.2.547.2.919diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.918 php-src/NEWS:1.2027.2.547.2.919
--- php-src/NEWS:1.2027.2.547.2.918 Fri Aug 31 08:07:27 2007
+++ php-src/NEWSFri Aug 31 09:36:01 2007
@@ -8,6 +8,8 @@
- Fixed bug #42452 (PDO classes do not expose Reflection API information).
(Hannes)
- Fixed bug #42326 (SoapServer crash). (Dmitry)
+- Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic
+ compliant wsdl). (Dmitry)
30 Aug 2007, PHP 5.2.4
- Removed --enable-versioning configure option. (Jani)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.27r2=1.156.2.28.2.28diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.27
php-src/ext/soap/soap.c:1.156.2.28.2.28
--- php-src/ext/soap/soap.c:1.156.2.28.2.27 Wed Aug 1 10:39:33 2007
+++ php-src/ext/soap/soap.c Fri Aug 31 09:36:02 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.27 2007/08/01 10:39:33 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.28 2007/08/31 09:36:02 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3248,7 +3248,17 @@
}
trav = trav-next;
}
- if (num_of_params 0) {
+
+ if (num_of_params == 1
+ function
+ function-binding
+ function-binding-bindingType == BINDING_SOAP
+
((sdlSoapBindingFunctionPtr)function-bindingAttributes)-style ==
SOAP_DOCUMENT
+ (function-requestParameters == NULL ||
+zend_hash_num_elements(function-requestParameters) == 0)
+ strcmp(params-name, function-functionName) == 0) {
+ num_of_params = 0;
+ } else if (num_of_params 0) {
tmp_parameters = safe_emalloc(num_of_params,
sizeof(zval *), 0);
trav = params;
@@ -3289,7 +3299,11 @@
if (function function-binding function-binding-bindingType ==
BINDING_SOAP) {
sdlSoapBindingFunctionPtr fnb =
(sdlSoapBindingFunctionPtr)function-bindingAttributes;
if (fnb-style == SOAP_DOCUMENT) {
- function = NULL;
+ if (func-children != NULL ||
+ (function-requestParameters != NULL
+
zend_hash_num_elements(function-requestParameters) 0)) {
+ function = NULL;
+ }
}
}
if (sdl != NULL function == NULL) {
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42086.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug42086.phpt
+++ php-src/ext/soap/tests/bugs/bug42086.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42086.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug42086.wsdl
+++ php-src/ext/soap/tests/bugs/bug42086.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug42151.phpt
dmitry Wed Aug 1 10:39:33 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug42151.phpt
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #42151 (__destruct functions not called after catching a SoapFault
exception)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.869r2=1.2027.2.547.2.870diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.869 php-src/NEWS:1.2027.2.547.2.870
--- php-src/NEWS:1.2027.2.547.2.869 Tue Jul 31 22:48:42 2007
+++ php-src/NEWSWed Aug 1 10:39:32 2007
@@ -70,6 +70,8 @@
- Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory
already exists). (Pierre)
+- Fixed bug #42151 (__destruct functions not called after catching a SoapFault
+ exception). (Dmitry)
- Fixed bug #42142 (substr_replace() returns FALSE when length string
length). (Ilia)
- Fixed bug #42135 (Second call of session_start() causes creation of SID).
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.26r2=1.156.2.28.2.27diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.26
php-src/ext/soap/soap.c:1.156.2.28.2.27
--- php-src/ext/soap/soap.c:1.156.2.28.2.26 Fri Jul 13 14:00:05 2007
+++ php-src/ext/soap/soap.c Wed Aug 1 10:39:33 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.26 2007/07/13 14:00:05 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.27 2007/08/01 10:39:33 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2067,6 +2067,7 @@
#ifdef va_copy
va_list argcopy;
#endif
+ zend_object_store_bucket *old_objects;
int old = PG(display_errors);
INIT_ZVAL(outbuf);
@@ -2093,6 +2094,8 @@
INIT_PZVAL(exception);
zend_throw_exception_object(exception TSRMLS_CC);
+ old_objects = EG(objects_store).object_buckets;
+ EG(objects_store).object_buckets = NULL;
PG(display_errors) = 0;
zend_try {
call_old_error_handler(error_num,
error_filename, error_lineno, format, args);
@@ -2101,6 +2104,7 @@
EG(in_execution) = _old_in_execution;
EG(current_execute_data) =
_old_current_execute_data;
} zend_end_try();
+ EG(objects_store).object_buckets = old_objects;
PG(display_errors) = old;
zend_bailout();
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42151.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug42151.phpt
+++ php-src/ext/soap/tests/bugs/bug42151.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
dmitry Fri Jul 13 14:00:06 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #41635 (SoapServer and zlib.output_compression with FastCGI result
in major slowdown
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.834r2=1.2027.2.547.2.835diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.834 php-src/NEWS:1.2027.2.547.2.835
--- php-src/NEWS:1.2027.2.547.2.834 Fri Jul 13 01:24:15 2007
+++ php-src/NEWSFri Jul 13 14:00:04 2007
@@ -108,6 +108,8 @@
- Fixed bug #41655 (open_basedir bypass via glob()). (Ilia)
- Fixed bug #41640 (get_class_vars produces error on class constants).
(Johannes)
+- Fixed bug #41635 (SoapServer and zlib.output_compression with FastCGI result
+ in major slowdown). (Dmitry)
- Fixed bug #41633 (Crash instantiating classes with self-referencing
constants). (Dmitry)
- Fixed bug #41630 (segfault when an invalid color index is present in
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.25r2=1.156.2.28.2.26diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.25
php-src/ext/soap/soap.c:1.156.2.28.2.26
--- php-src/ext/soap/soap.c:1.156.2.28.2.25 Sun May 27 17:46:46 2007
+++ php-src/ext/soap/soap.c Fri Jul 13 14:00:05 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.25 2007/05/27 17:46:46 iliaa Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.26 2007/07/13 14:00:05 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1848,8 +1848,6 @@
php_error_docref(NULL TSRMLS_CC, E_ERROR, Dump memory
failed);
}
- snprintf(cont_len, sizeof(cont_len), Content-Length: %d,
size);
- sapi_add_header(cont_len, strlen(cont_len), 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 {
@@ -1857,8 +1855,38 @@
}
xmlFreeDoc(doc_return);
- php_write(buf, size TSRMLS_CC);
- xmlFree(buf);
+
+ if (zend_ini_long(zlib.output_compression,
sizeof(zlib.output_compression), 0)
+ zend_hash_exists(EG(function_table), ob_gzhandler,
sizeof(ob_gzhandler))) {
+ zval nm_ob_gzhandler;
+ zval str;
+ zval mode;
+ zval result;
+ zval *params[2];
+
+ INIT_ZVAL(result);
+ ZVAL_STRINGL(nm_ob_gzhandler, ob_gzhandler,
sizeof(ob_gzhandler) - 1, 0);
+ ZVAL_STRINGL(str, (char*)buf, size, 0);
+ params[0] = str;
+ ZVAL_LONG(mode, PHP_OUTPUT_HANDLER_START |
PHP_OUTPUT_HANDLER_END);
+ params[1] = mode;
+ if (call_user_function(CG(function_table), NULL,
nm_ob_gzhandler, result, 2, params TSRMLS_CC) != FAILURE
+ Z_TYPE(result) == IS_STRING
+ zend_alter_ini_entry(zlib.output_compression,
sizeof(zlib.output_compression), 0, sizeof(0)-1, PHP_INI_USER,
PHP_INI_STAGE_RUNTIME) == SUCCESS) {
+ xmlFree(buf);
+ buf = NULL;
+ snprintf(cont_len, sizeof(cont_len),
Content-Length: %d, Z_STRLEN(result));
+ sapi_add_header(cont_len, strlen(cont_len), 1);
+ php_write(Z_STRVAL(result), Z_STRLEN(result)
TSRMLS_CC);
+ }
+ zval_dtor(result);
+ }
+ if (buf) {
+ snprintf(cont_len, sizeof(cont_len), Content-Length:
%d, size);
+ sapi_add_header(cont_len, strlen(cont_len), 1);
+ php_write(buf, size TSRMLS_CC);
+ xmlFree(buf);
+ }
} else {
sapi_add_header(HTTP/1.1 202 Accepted, sizeof(HTTP/1.1 202
Accepted)-1, 1);
sapi_add_header(Content-Length: 0, sizeof(Content-Length:
0)-1, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug41477.phpt
iliaa Sun May 27 17:46:46 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug41477.phpt
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #41477 (no arginfo about SoapClient::__soapCall()).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.740r2=1.2027.2.547.2.741diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.740 php-src/NEWS:1.2027.2.547.2.741
--- php-src/NEWS:1.2027.2.547.2.740 Sun May 27 17:33:39 2007
+++ php-src/NEWSSun May 27 17:46:46 2007
@@ -5,6 +5,7 @@
- Fixed bug #41492 (open_basedir/safe_mode bypass inside realpath()). (Ilia)
- Fixed bug #41504 (json_decode() incorrectly decodes JSON arrays with empty
string keys). (Ilia)
+- Fixed bug #41477 (no arginfo about SoapClient::__soapCall()). (Ilia)
- Fixed bug #41236 (Regression in timeout handling of non-blocking SSL
connections during reads and writes). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.24r2=1.156.2.28.2.25diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.24
php-src/ext/soap/soap.c:1.156.2.28.2.25
--- php-src/ext/soap/soap.c:1.156.2.28.2.24 Sun May 6 17:21:13 2007
+++ php-src/ext/soap/soap.c Sun May 27 17:46:46 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.24 2007/05/06 17:21:13 iliaa Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.25 2007/05/27 17:46:46 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -314,11 +314,11 @@
ZEND_ARG_PASS_INFO(0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(__soap_call_args, 0, 0, 2)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
+ ZEND_ARG_INFO(0, function_name)
+ ZEND_ARG_INFO(0, arguments)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, input_headers)
+ ZEND_ARG_INFO(1, output_headers)
ZEND_END_ARG_INFO()
#else
unsigned char __call_args[] = { 2, BYREF_NONE, BYREF_NONE };
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41477.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug41477.phpt
+++ php-src/ext/soap/tests/bugs/bug41477.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
Hi Ilia,
Why do you completely break ext/soap (all tests are failed)?
Why do you do it in PHP_5_2 branch? (we have HEAD for experiments)
Your patch doesn't allow me to fix other ext/soap issues, because it
completely breaks test suite.
Please finish your fix ASAP (also for HEAD) or revert it.
Thanks. Dmitry.
-Original Message-
From: Ilia Alshanetsky [mailto:[EMAIL PROTECTED]
Sent: Sunday, May 06, 2007 9:21 PM
To: php-cvs@lists.php.net
Subject: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
iliaa Sun May 6 17:21:13 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/soap soap.c
Log:
Allow SOAP extension's handler() to work even when
always_populate_raw_post_data is off.
# Tests will be updated in the next few days
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.6
85r2=1.2027.2.547.2.686diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.685
php-src/NEWS:1.2027.2.547.2.686
--- php-src/NEWS:1.2027.2.547.2.685 Sun May 6 16:34:14 2007
+++ php-src/NEWS Sun May 6 17:21:13 2007
@@ -1,6 +1,8 @@
PHP
NEWS
||
|
?? ??? 2007, PHP 5.2.3
+- Allow SOAP extension's handler() to work even when
+ always_populate_raw_post_data is off. (Ilia)
- Fixed ext/filter Email Validation Vulnerability (MOPB-24
by Stefan Esser)
(Ilia)
- Fixed altering $this via argument named this. (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156
.2.28.2.23r2=1.156.2.28.2.24diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.23
php-src/ext/soap/soap.c:1.156.2.28.2.24
--- php-src/ext/soap/soap.c:1.156.2.28.2.23 Wed May 2 08:22:13 2007
+++ php-src/ext/soap/soap.c Sun May 6 17:21:13 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED]
|
+-
-+
*/
-/* $Id: soap.c,v 1.156.2.28.2.23 2007/05/02 08:22:13 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.24 2007/05/06 17:21:13 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -140,8 +140,6 @@
SOAP_GLOBAL(soap_version) = _old_soap_version;
#endif
-#define HTTP_RAW_POST_DATA HTTP_RAW_POST_DATA
-
#define ZERO_PARAM() \
if (ZEND_NUM_ARGS() != 0) \
WRONG_PARAM_COUNT;
@@ -1403,7 +1401,7 @@
sdlPtr old_sdl = NULL;
soapServicePtr service;
xmlDocPtr doc_request=NULL, doc_return;
- zval function_name, **params, **raw_post, *soap_obj, retval;
+ zval function_name, **params, *soap_obj, retval;
char *fn_name, cont_len[30];
int num_params = 0, size, i, call_status = 0;
xmlChar *buf;
@@ -1478,8 +1476,9 @@
}
if (ZEND_NUM_ARGS() == 0) {
- if (zend_hash_find(EG(symbol_table),
HTTP_RAW_POST_DATA, sizeof(HTTP_RAW_POST_DATA), (void **)
raw_post)!=FAILURE
- ((*raw_post)-type==IS_STRING)) {
+ if (SG(request_info).raw_post_data) {
+ char *post_data =
SG(request_info).raw_post_data;
+ int post_data_length =
SG(request_info).raw_post_data_length;
zval **server_vars, **encoding;
zend_is_auto_global(_SERVER,
sizeof(_SERVER)-1 TSRMLS_CC); @@ -1497,13 +1496,13 @@
zend_hash_exists(EG(function_table), gzinflate,
sizeof(gzinflate))) {
ZVAL_STRING(func,
gzinflate, 0);
params[0] = param;
- ZVAL_STRINGL(params[0],
Z_STRVAL_PP(raw_post)+10, Z_STRLEN_PP(raw_post)-10, 0);
+ ZVAL_STRINGL(params[0],
post_data+10, post_data_length-10, 0);
INIT_PZVAL(params[0]);
} else if
(strcmp(Z_STRVAL_PP(encoding),deflate) == 0
zend_hash_exists(EG(function_table),
gzuncompress, sizeof(gzuncompress))) {
ZVAL_STRING(func,
gzuncompress, 0);
params[0] = param;
- ZVAL_STRINGL(params[0],
Z_STRVAL_PP(raw_post), Z_STRLEN_PP(raw_post), 0);
+ ZVAL_STRINGL(params[0],
post_data, post_data_length, 0);
INIT_PZVAL(params[0]);
} else {
php_error_docref(NULL
TSRMLS_CC, E_ERROR,Request is compressed with unknown
compression '%s',Z_STRVAL_PP(encoding)); @@ -1516,16 +1515,9
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
On 7-May-07, at 4:19 AM, Dmitry Stogov wrote: Hi Ilia, Why do you completely break ext/soap (all tests are failed)? The soap is hardly broken, what the patch changed was allow SoapServer's handle() method to work without any parameters even when always_populate_raw_post_data is off. However, because all your tests use a hack to HTTP_RAW_POST_DATA they broke. As I've said in the commit message I'll fix the tests in the next day or two. Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
Dmitry,
All of the tests have been fixed and now pass. I've had to convert
the gzip/deflate tests to use CGI and added an additional test to
check basic POST retrieval from a request (server029).
On 7-May-07, at 4:19 AM, Dmitry Stogov wrote:
Hi Ilia,
Why do you completely break ext/soap (all tests are failed)?
Why do you do it in PHP_5_2 branch? (we have HEAD for experiments)
Your patch doesn't allow me to fix other ext/soap issues, because it
completely breaks test suite.
Please finish your fix ASAP (also for HEAD) or revert it.
Thanks. Dmitry.
-Original Message-
From: Ilia Alshanetsky [mailto:[EMAIL PROTECTED]
Sent: Sunday, May 06, 2007 9:21 PM
To: php-cvs@lists.php.net
Subject: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
iliaa Sun May 6 17:21:13 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Allow SOAP extension's handler() to work even when
always_populate_raw_post_data is off.
# Tests will be updated in the next few days
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.6
85r2=1.2027.2.547.2.686diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.685
php-src/NEWS:1.2027.2.547.2.686
--- php-src/NEWS:1.2027.2.547.2.685 Sun May 6 16:34:14 2007
+++ php-src/NEWSSun May 6 17:21:13 2007
@@ -1,6 +1,8 @@
PHP
NEWS
||
|
?? ??? 2007, PHP 5.2.3
+- Allow SOAP extension's handler() to work even when
+ always_populate_raw_post_data is off. (Ilia)
- Fixed ext/filter Email Validation Vulnerability (MOPB-24
by Stefan Esser)
(Ilia)
- Fixed altering $this via argument named this. (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156
.2.28.2.23r2=1.156.2.28.2.24diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.23
php-src/ext/soap/soap.c:1.156.2.28.2.24
--- php-src/ext/soap/soap.c:1.156.2.28.2.23 Wed May 2 08:22:13 2007
+++ php-src/ext/soap/soap.c Sun May 6 17:21:13 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED]
|
+-
-+
*/
-/* $Id: soap.c,v 1.156.2.28.2.23 2007/05/02 08:22:13 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.24 2007/05/06 17:21:13 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -140,8 +140,6 @@
SOAP_GLOBAL(soap_version) = _old_soap_version;
#endif
-#define HTTP_RAW_POST_DATA HTTP_RAW_POST_DATA
-
#define ZERO_PARAM() \
if (ZEND_NUM_ARGS() != 0) \
WRONG_PARAM_COUNT;
@@ -1403,7 +1401,7 @@
sdlPtr old_sdl = NULL;
soapServicePtr service;
xmlDocPtr doc_request=NULL, doc_return;
- zval function_name, **params, **raw_post, *soap_obj, retval;
+ zval function_name, **params, *soap_obj, retval;
char *fn_name, cont_len[30];
int num_params = 0, size, i, call_status = 0;
xmlChar *buf;
@@ -1478,8 +1476,9 @@
}
if (ZEND_NUM_ARGS() == 0) {
- if (zend_hash_find(EG(symbol_table),
HTTP_RAW_POST_DATA, sizeof(HTTP_RAW_POST_DATA), (void **)
raw_post)!=FAILURE
-((*raw_post)-type==IS_STRING)) {
+ if (SG(request_info).raw_post_data) {
+ char *post_data =
SG(request_info).raw_post_data;
+ int post_data_length =
SG(request_info).raw_post_data_length;
zval **server_vars, **encoding;
zend_is_auto_global(_SERVER,
sizeof(_SERVER)-1 TSRMLS_CC); @@ -1497,13 +1496,13 @@
zend_hash_exists(EG(function_table), gzinflate,
sizeof(gzinflate))) {
ZVAL_STRING(func,
gzinflate, 0);
params[0] = param;
- ZVAL_STRINGL(params[0],
Z_STRVAL_PP(raw_post)+10, Z_STRLEN_PP(raw_post)-10, 0);
+ ZVAL_STRINGL(params[0],
post_data+10, post_data_length-10, 0);
INIT_PZVAL(params[0]);
} else if
(strcmp(Z_STRVAL_PP(encoding),deflate) == 0
zend_hash_exists(EG(function_table),
gzuncompress, sizeof(gzuncompress))) {
ZVAL_STRING(func,
gzuncompress, 0);
params[0] = param;
- ZVAL_STRINGL(params[0],
Z_STRVAL_PP(raw_post), Z_STRLEN_PP(raw_post), 0);
+ ZVAL_STRINGL(params[0],
post_data, post_data_length, 0);
INIT_PZVAL(params[0]);
} else {
php_error_docref(NULL
TSRMLS_CC, E_ERROR,Request is compressed with unknown
compression '%s
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
iliaa Sun May 6 17:21:13 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Allow SOAP extension's handler() to work even when
always_populate_raw_post_data is off.
# Tests will be updated in the next few days
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.685r2=1.2027.2.547.2.686diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.685 php-src/NEWS:1.2027.2.547.2.686
--- php-src/NEWS:1.2027.2.547.2.685 Sun May 6 16:34:14 2007
+++ php-src/NEWSSun May 6 17:21:13 2007
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2007, PHP 5.2.3
+- Allow SOAP extension's handler() to work even when
+ always_populate_raw_post_data is off. (Ilia)
- Fixed ext/filter Email Validation Vulnerability (MOPB-24 by Stefan Esser)
(Ilia)
- Fixed altering $this via argument named this. (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.23r2=1.156.2.28.2.24diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.23
php-src/ext/soap/soap.c:1.156.2.28.2.24
--- php-src/ext/soap/soap.c:1.156.2.28.2.23 Wed May 2 08:22:13 2007
+++ php-src/ext/soap/soap.c Sun May 6 17:21:13 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.23 2007/05/02 08:22:13 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.24 2007/05/06 17:21:13 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -140,8 +140,6 @@
SOAP_GLOBAL(soap_version) = _old_soap_version;
#endif
-#define HTTP_RAW_POST_DATA HTTP_RAW_POST_DATA
-
#define ZERO_PARAM() \
if (ZEND_NUM_ARGS() != 0) \
WRONG_PARAM_COUNT;
@@ -1403,7 +1401,7 @@
sdlPtr old_sdl = NULL;
soapServicePtr service;
xmlDocPtr doc_request=NULL, doc_return;
- zval function_name, **params, **raw_post, *soap_obj, retval;
+ zval function_name, **params, *soap_obj, retval;
char *fn_name, cont_len[30];
int num_params = 0, size, i, call_status = 0;
xmlChar *buf;
@@ -1478,8 +1476,9 @@
}
if (ZEND_NUM_ARGS() == 0) {
- if (zend_hash_find(EG(symbol_table), HTTP_RAW_POST_DATA,
sizeof(HTTP_RAW_POST_DATA), (void **) raw_post)!=FAILURE
-((*raw_post)-type==IS_STRING)) {
+ if (SG(request_info).raw_post_data) {
+ char *post_data = SG(request_info).raw_post_data;
+ int post_data_length =
SG(request_info).raw_post_data_length;
zval **server_vars, **encoding;
zend_is_auto_global(_SERVER, sizeof(_SERVER)-1
TSRMLS_CC);
@@ -1497,13 +1496,13 @@
zend_hash_exists(EG(function_table),
gzinflate, sizeof(gzinflate))) {
ZVAL_STRING(func, gzinflate, 0);
params[0] = param;
- ZVAL_STRINGL(params[0],
Z_STRVAL_PP(raw_post)+10, Z_STRLEN_PP(raw_post)-10, 0);
+ ZVAL_STRINGL(params[0], post_data+10,
post_data_length-10, 0);
INIT_PZVAL(params[0]);
} else if
(strcmp(Z_STRVAL_PP(encoding),deflate) == 0
zend_hash_exists(EG(function_table), gzuncompress,
sizeof(gzuncompress))) {
ZVAL_STRING(func, gzuncompress, 0);
params[0] = param;
- ZVAL_STRINGL(params[0],
Z_STRVAL_PP(raw_post), Z_STRLEN_PP(raw_post), 0);
+ ZVAL_STRINGL(params[0], post_data,
post_data_length, 0);
INIT_PZVAL(params[0]);
} else {
php_error_docref(NULL TSRMLS_CC,
E_ERROR,Request is compressed with unknown compression
'%s',Z_STRVAL_PP(encoding));
@@ -1516,16 +1515,9 @@
php_error_docref(NULL TSRMLS_CC,
E_ERROR,Can't uncompress compressed request);
}
} else {
- doc_request =
soap_xmlParseMemory(Z_STRVAL_PP(raw_post),Z_STRLEN_PP(raw_post));
+ doc_request = soap_xmlParseMemory(post_data,
post_data_length);
}
} else {
- if (SG(request_info).request_method
- strcmp(SG(request_info).request_method, POST) == 0) {
-
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
dmitry Mon Sep 4 10:52:34 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #38700 (SoapClient::__getTypes never returns)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.232r2=1.2027.2.547.2.233diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.232 php-src/NEWS:1.2027.2.547.2.233
--- php-src/NEWS:1.2027.2.547.2.232 Sun Sep 3 16:32:27 2006
+++ php-src/NEWSMon Sep 4 10:52:34 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? Sep 2006, PHP 5.2.0RC4
+- Fixed bug #38700 (SoapClient::__getTypes never returns). (Dmitry)
- Fixed bug #38661 (mixed-case URL breaks url-wrappers). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.9r2=1.156.2.28.2.10diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.9
php-src/ext/soap/soap.c:1.156.2.28.2.10
--- php-src/ext/soap/soap.c:1.156.2.28.2.9 Thu Aug 24 06:18:30 2006
+++ php-src/ext/soap/soap.c Mon Sep 4 10:52:34 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.9 2006/08/24 06:18:30 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.10 2006/09/04 10:52:34 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4543,6 +4543,7 @@
type-kind == XSD_TYPEKIND_EXTENSION)
type-encode) {
encodePtr enc = type-encode;
while (enc enc-details.sdl_type
+ enc !=
enc-details.sdl_type-encode
enc-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
enc-details.sdl_type-kind !=
XSD_TYPEKIND_LIST
enc-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
