[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap soap.c

2009-02-02 Thread Felipe Pena 
felipe  Mon Feb  2 10:00:33 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   soap.c 
  Log:
  - MFH: Fixed bug #47269 (Typo: SoapSlient instead of SoapClient)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.42r2=1.156.2.28.2.43diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.42 
php-src/ext/soap/soap.c:1.156.2.28.2.43
--- php-src/ext/soap/soap.c:1.156.2.28.2.42 Mon Jan  5 22:16:58 2009
+++ php-src/ext/soap/soap.c Mon Feb  2 10:00:32 2009
@@ -17,7 +17,7 @@
   |  Dmitry Stogov dmi...@zend.com |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.42 2009/01/05 22:16:58 felipe Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.43 2009/02/02 10:00:32 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2567,11 +2567,11 @@
ZVAL_LONG(params[4], one_way);
 
if (call_user_function(NULL, this_ptr, func, response, 5, params 
TSRMLS_CC) != SUCCESS) {
-   add_soap_fault(this_ptr, Client, SoapSlient::__doRequest() 
failed, NULL, NULL TSRMLS_CC);
+   add_soap_fault(this_ptr, Client, SoapClient::__doRequest() 
failed, NULL, NULL TSRMLS_CC);
ret = FALSE;
} else if (Z_TYPE_P(response) != IS_STRING) {
if (zend_hash_find(Z_OBJPROP_P(this_ptr), __soap_fault, 
sizeof(__soap_fault), (void **) fault) == FAILURE) {
-   add_soap_fault(this_ptr, Client, 
SoapSlient::__doRequest() returned non string value, NULL, NULL TSRMLS_CC);
+   add_soap_fault(this_ptr, Client, 
SoapClient::__doRequest() returned non string value, NULL, NULL TSRMLS_CC);
}
ret = FALSE;
} else if (zend_hash_find(Z_OBJPROP_P(this_ptr), trace, 
sizeof(trace), (void **) trace) == SUCCESS 



-- 
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) /ext/soap soap.c /ext/soap/tests bug46760.phpt

2009-01-05 Thread Felipe Pena 
felipe  Mon Jan  5 22:16:58 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests bug46760.phpt 

  Modified files:  
/php-src/ext/soap   soap.c 
  Log:
  - Fixed bug #46760 (SoapClient doRequest fails when proxy is used) [only in 
this branch]
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.41r2=1.156.2.28.2.42diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.41 
php-src/ext/soap/soap.c:1.156.2.28.2.42
--- php-src/ext/soap/soap.c:1.156.2.28.2.41 Wed Dec 31 11:17:43 2008
+++ php-src/ext/soap/soap.c Mon Jan  5 22:16:58 2009
@@ -17,7 +17,7 @@
   |  Dmitry Stogov dmi...@zend.com |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.41 2008/12/31 11:17:43 sebastian Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.42 2009/01/05 22:16:58 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2381,8 +2381,8 @@
if (zend_hash_find(ht, proxy_host, sizeof(proxy_host), 
(void**)tmp) == SUCCESS 
Z_TYPE_PP(tmp) == IS_STRING) {
add_property_stringl(this_ptr, _proxy_host, 
Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1);
-   if (zend_hash_find(ht, proxy_port, 
sizeof(proxy_port), (void**)tmp) == SUCCESS 
-   Z_TYPE_PP(tmp) == IS_LONG) {
+   if (zend_hash_find(ht, proxy_port, 
sizeof(proxy_port), (void**)tmp) == SUCCESS) {
+   convert_to_long(*tmp);
add_property_long(this_ptr, _proxy_port, 
Z_LVAL_PP(tmp));
}
if (zend_hash_find(ht, proxy_login, 
sizeof(proxy_login), (void**)tmp) == SUCCESS 

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bug46760.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bug46760.phpt
+++ php-src/ext/soap/tests/bug46760.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) /ext/soap soap.c

2008-03-04 Thread Dmitry Stogov 
dmitry  Tue Mar  4 12:23:11 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   soap.c 
  Log:
  Fixed SIGSEGV because of acess to uninitialized data
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.38r2=1.156.2.28.2.39diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.38 
php-src/ext/soap/soap.c:1.156.2.28.2.39
--- php-src/ext/soap/soap.c:1.156.2.28.2.38 Fri Feb 15 06:50:39 2008
+++ php-src/ext/soap/soap.c Tue Mar  4 12:23:10 2008
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.38 2008/02/15 06:50:39 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.39 2008/03/04 12:23:10 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -511,6 +511,7 @@
SOAP_GLOBAL(encoding) = NULL;
SOAP_GLOBAL(class_map) = NULL;
SOAP_GLOBAL(features) = 0;
+   SOAP_GLOBAL(ref_map) = NULL;
return SUCCESS;
 }
 



-- 
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) /ext/soap soap.c

2008-01-15 Thread Dmitry Stogov 
dmitry  Wed Jan 16 06:14:46 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   soap.c 
  Log:
  Fixed wrong type cast
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.36r2=1.156.2.28.2.37diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.36 
php-src/ext/soap/soap.c:1.156.2.28.2.37
--- php-src/ext/soap/soap.c:1.156.2.28.2.36 Wed Jan  9 16:45:28 2008
+++ php-src/ext/soap/soap.c Wed Jan 16 06:14:45 2008
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.36 2008/01/09 16:45:28 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.37 2008/01/16 06:14:45 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -404,7 +404,7 @@
char *base = (char *) ts_resource(*((int *) mh_arg2));
 #endif
 
-   p = (long*) (base+(size_t) mh_arg1);
+   p = (char*) (base+(size_t) mh_arg1);
 
*p = (char)atoi(new_value);
 

-- 
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) /ext/soap soap.c

2007-11-01 Thread Dmitry Stogov 
dmitry  Thu Nov  1 14:11:47 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/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/ext/soap/soap.c?r1=1.156.2.28.2.31r2=1.156.2.28.2.32diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.31 
php-src/ext/soap/soap.c:1.156.2.28.2.32
--- php-src/ext/soap/soap.c:1.156.2.28.2.31 Thu Nov  1 14:10:19 2007
+++ php-src/ext/soap/soap.c Thu Nov  1 14:11:47 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.31 2007/11/01 14:10:19 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.32 2007/11/01 14:11:47 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1872,8 +1872,10 @@
 
INIT_ZVAL(result);
ZVAL_STRINGL(nm_ob_gzhandler, ob_gzhandler, 
sizeof(ob_gzhandler) - 1, 0);
+   INIT_PZVAL(str);
ZVAL_STRINGL(str, (char*)buf, size, 0);
params[0] = str;
+   INIT_PZVAL(mode);
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 
@@ -2011,17 +2013,47 @@
   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);
-   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 {
sapi_add_header(Content-Type: text/xml; charset=utf-8, 
sizeof(Content-Type: text/xml; charset=utf-8)-1, 1);
}
-   php_write(buf, size TSRMLS_CC);
+
+   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);
+   INIT_PZVAL(str);
+   ZVAL_STRINGL(str, (char*)buf, size, 0);
+   params[0] = str;
+   INIT_PZVAL(mode);
+   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);
+   }
 
xmlFreeDoc(doc_return);
-   xmlFree(buf);
zend_clear_exception(TSRMLS_C);
 }
 

-- 
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) /ext/soap soap.c /ext/standard html.c /ext/wddx wddx.c

2007-01-18 Thread Antony Dovgal 
tony2001Thu Jan 18 16:21:32 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   soap.c 
/php-src/ext/standard   html.c 
/php-src/ext/wddx   wddx.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.17r2=1.156.2.28.2.18diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.17 
php-src/ext/soap/soap.c:1.156.2.28.2.18
--- php-src/ext/soap/soap.c:1.156.2.28.2.17 Mon Jan  1 09:36:07 2007
+++ php-src/ext/soap/soap.c Thu Jan 18 16:21:32 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.17 2007/01/01 09:36:07 sebastian Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.18 2007/01/18 16:21:32 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1853,7 +1853,7 @@
php_error_docref(NULL TSRMLS_CC, E_ERROR, Dump memory 
failed);
}   
 
-   sprintf(cont_len, Content-Length: %d, size);
+   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);
@@ -1982,7 +1982,7 @@
   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);
-   sprintf(cont_len,Content-Length: %d, size);
+   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);
@@ -4223,7 +4223,7 @@
} else {
if (name == NULL) {
paramName = paramNameBuf;
-   sprintf(paramName,param%d,index);
+   snprintf(paramName, sizeof(paramNameBuf), 
param%d,index);
} else {
paramName = name;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.5r2=1.111.2.2.2.6diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.5 
php-src/ext/standard/html.c:1.111.2.2.2.6
--- php-src/ext/standard/html.c:1.111.2.2.2.5   Mon Jan  1 09:36:08 2007
+++ php-src/ext/standard/html.c Thu Jan 18 16:21:32 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: html.c,v 1.111.2.2.2.5 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.6 2007/01/18 16:21:32 tony2001 Exp $ */
 
 /*
  * HTML entity resources:
@@ -1354,7 +1354,7 @@
continue;
/* what about wide chars here ?? */
ind[0] = i + entity_map[j].basechar;
-   sprintf(buffer, %s;, 
entity_map[j].table[i]);
+   snprintf(buffer, sizeof(buffer), 
%s;, entity_map[j].table[i]);
add_assoc_string(return_value, ind, 
buffer, 1);
 
}
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.9r2=1.119.2.10.2.10diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.9 
php-src/ext/wddx/wddx.c:1.119.2.10.2.10
--- php-src/ext/wddx/wddx.c:1.119.2.10.2.9  Tue Jan  9 15:20:45 2007
+++ php-src/ext/wddx/wddx.c Thu Jan 18 16:21:32 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: wddx.c,v 1.119.2.10.2.9 2007/01/09 15:20:45 iliaa Exp $ */
+/* $Id: wddx.c,v 1.119.2.10.2.10 2007/01/18 16:21:32 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -448,7 +448,7 @@
PHP_SET_CLASS_ATTRIBUTES(obj);
 
php_wddx_add_chunk_static(packet, WDDX_STRUCT_S);
-   sprintf(tmp_buf, WDDX_VAR_S, PHP_CLASS_NAME_VAR);
+   snprintf(tmp_buf, WDDX_BUF_LEN, WDDX_VAR_S, 
PHP_CLASS_NAME_VAR);
php_wddx_add_chunk(packet, tmp_buf);
php_wddx_add_chunk_static(packet, WDDX_STRING_S);
php_wddx_add_chunk_ex(packet, class_name, name_len);
@@ -480,7 +480,7 @@
PHP_SET_CLASS_ATTRIBUTES(obj);
 
php_wddx_add_chunk_static(packet, WDDX_STRUCT_S);
-   sprintf(tmp_buf, WDDX_VAR_S, PHP_CLASS_NAME_VAR);
+

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap soap.c

2006-09-28 Thread Hannes Magnusson 
bjori   Thu Sep 28 11:32:30 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   soap.c 
  Log:
  MFH: fix arginfoproto
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.14r2=1.156.2.28.2.15diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.14 
php-src/ext/soap/soap.c:1.156.2.28.2.15
--- php-src/ext/soap/soap.c:1.156.2.28.2.14 Mon Sep 25 08:15:03 2006
+++ php-src/ext/soap/soap.c Thu Sep 28 11:32:30 2006
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.14 2006/09/25 08:15:03 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.15 2006/09/28 11:32:30 bjori Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -315,7 +315,7 @@
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(0)
 ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO(__soap_call_args, 0)
+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)
@@ -2690,7 +2690,7 @@
 }
 
 
-/* {{{ proto mixed SoapClient::__call ( string function_name [, array 
arguments [, array options [, array input_headers [, array output_headers)
+/* {{{ proto mixed SoapClient::__call ( string function_name, array arguments 
[, array options [, array input_headers [, array output_headers]]])
Calls a SOAP function */
 PHP_METHOD(SoapClient, __call)
 {

-- 
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) /ext/soap soap.c

2006-09-25 Thread Dmitry Stogov 
dmitry  Mon Sep 25 08:15:03 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   soap.c 
  Log:
  Removed warning about unreferenced local variable
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.13r2=1.156.2.28.2.14diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.13 
php-src/ext/soap/soap.c:1.156.2.28.2.14
--- php-src/ext/soap/soap.c:1.156.2.28.2.13 Fri Sep 22 13:39:32 2006
+++ php-src/ext/soap/soap.c Mon Sep 25 08:15:03 2006
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.13 2006/09/22 13:39:32 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.14 2006/09/25 08:15:03 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2041,7 +2041,9 @@
char buffer[1024];
int buffer_len;
zval outbuf, outbuflen;
+#ifdef va_copy
va_list argcopy;
+#endif
int old = PG(display_errors);
 
INIT_ZVAL(outbuf);
@@ -2088,7 +2090,9 @@
int old = PG(display_errors);
int fault = 0;
zval fault_obj;
+#ifdef va_copy
va_list argcopy;
+#endif
 
if (error_num == E_USER_ERROR || 
error_num == E_COMPILE_ERROR || 

-- 
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) /ext/soap soap.c

2006-09-22 Thread Dmitry Stogov 
dmitry  Fri Sep 22 13:39:32 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   soap.c 
  Log:
  Prevent access to dead zval
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.12r2=1.156.2.28.2.13diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.12 
php-src/ext/soap/soap.c:1.156.2.28.2.13
--- php-src/ext/soap/soap.c:1.156.2.28.2.12 Wed Sep 20 13:42:50 2006
+++ php-src/ext/soap/soap.c Fri Sep 22 13:39:32 2006
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.12 2006/09/20 13:42:50 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.13 2006/09/22 13:39:32 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1765,9 +1765,11 @@
 #if HAVE_PHP_SESSION  !defined(COMPILE_DL_SESSION)
if (service-soap_class.persistance != 
SOAP_PERSISTENCE_SESSION) {
zval_ptr_dtor(soap_obj);
+   soap_obj = NULL;
}
 #else
zval_ptr_dtor(soap_obj);
+   soap_obj = NULL;
 #endif
}
} 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) /ext/soap soap.c

2006-09-15 Thread Dmitry Stogov 
dmitry  Fri Sep 15 07:11:35 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   soap.c 
  Log:
  Fixed memory leak
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.10r2=1.156.2.28.2.11diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.10 
php-src/ext/soap/soap.c:1.156.2.28.2.11
--- php-src/ext/soap/soap.c:1.156.2.28.2.10 Mon Sep  4 10:52:34 2006
+++ php-src/ext/soap/soap.c Fri Sep 15 07:11:35 2006
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.10 2006/09/04 10:52:34 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.11 2006/09/15 07:11:35 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -3764,7 +3764,9 @@
xmlAddChild(param, node);
if (fault_ns) {
xmlNsPtr nsptr = encode_add_ns(node, 
fault_ns);
-   xmlNodeSetContent(node, 
xmlBuildQName(BAD_CAST(str), nsptr-prefix, NULL, 0));
+   xmlChar *code = 
xmlBuildQName(BAD_CAST(str), nsptr-prefix, NULL, 0);
+   xmlNodeSetContent(node, code);
+   xmlFree(code);
} else {
xmlNodeSetContentLen(node, 
BAD_CAST(str), new_len);
}
@@ -3787,7 +3789,9 @@
node = xmlNewChild(node, ns, BAD_CAST(Value), 
NULL);
if (fault_ns) {
xmlNsPtr nsptr = encode_add_ns(node, 
fault_ns);
-   xmlNodeSetContent(node, 
xmlBuildQName(BAD_CAST(str), nsptr-prefix, NULL, 0));
+   xmlChar *code = 
xmlBuildQName(BAD_CAST(str), nsptr-prefix, NULL, 0);
+   xmlNodeSetContent(node, code);
+   xmlFree(code);
} else {
xmlNodeSetContentLen(node, 
BAD_CAST(str), new_len);
}

-- 
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) /ext/soap soap.c /ext/soap/tests setheaders.phpt

2006-07-31 Thread Dmitry Stogov 
dmitry  Mon Jul 31 13:41:34 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests setheaders.phpt 

  Modified files:  
/php-src/ext/soap   soap.c 
  Log:
  Fixed crash in SoapClient::__setSoapHeaders()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.6r2=1.156.2.28.2.7diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.6 
php-src/ext/soap/soap.c:1.156.2.28.2.7
--- php-src/ext/soap/soap.c:1.156.2.28.2.6  Tue Jul 11 14:35:50 2006
+++ php-src/ext/soap/soap.c Mon Jul 31 13:41:33 2006
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.6 2006/07/11 14:35:50 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.7 2006/07/31 13:41:33 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2923,7 +2923,7 @@
If no value is specified, all of the headers are removed. */
 PHP_METHOD(SoapClient, __setSoapHeaders)
 {
-   zval *headers;
+   zval *headers = NULL;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |z, headers) == 
FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid parameters);
@@ -2944,7 +2944,9 @@
zval *default_headers;
ALLOC_INIT_ZVAL(default_headers);
array_init(default_headers);
+   headers-refcount++;
add_next_index_zval(default_headers, headers);
+   default_headers-refcount--;
add_property_zval(this_ptr, __default_headers, 
default_headers);
} else{
php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid SOAP 
header);

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/setheaders.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/setheaders.phpt
+++ php-src/ext/soap/tests/setheaders.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) /ext/soap soap.c

2006-07-31 Thread Dmitry Stogov 
dmitry  Mon Jul 31 15:31:01 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   soap.c 
  Log:
  Prevented possible double call in case of fault
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.7r2=1.156.2.28.2.8diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.7 
php-src/ext/soap/soap.c:1.156.2.28.2.8
--- php-src/ext/soap/soap.c:1.156.2.28.2.7  Mon Jul 31 13:41:33 2006
+++ php-src/ext/soap/soap.c Mon Jul 31 15:31:01 2006
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.7 2006/07/31 13:41:33 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.8 2006/07/31 15:31:01 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2866,8 +2866,10 @@
if (SOAP_GLOBAL(features)  SOAP_WAIT_ONE_WAY_CALLS) {
one_way = 0;
}
-   if (one_way  make_http_soap_request(this_ptr, buf, buf_size, 
location, action, version, NULL, NULL TSRMLS_CC)) {
-   RETURN_EMPTY_STRING();
+   if (one_way) {
+   if (make_http_soap_request(this_ptr, buf, buf_size, location, 
action, version, NULL, NULL TSRMLS_CC)) {
+   RETURN_EMPTY_STRING();
+   }
} else if (make_http_soap_request(this_ptr, buf, buf_size, location, 
action, version,
Z_STRVAL_P(return_value), Z_STRLEN_P(return_value) TSRMLS_CC)) {
return_value-type = IS_STRING;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php