cvs: php-src /ext/soap php_http.c php_xml.c

From: Date: Wed, 17 Jan 2007 00:22:48 +0000
Subject: cvs: php-src /ext/soap php_http.c php_xml.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-42751@lists.php.net to get a copy of this message
pollita Wed Jan 17 00:22:48 2007 UTC Modified files: /php-src/ext/soap php_http.c php_xml.c Log: INI options should not be modified directly. Bad extension. No cookie for you. http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.99&r2=1.100&diff_format=u Index: php-src/ext/soap/php_http.c diff -u php-src/ext/soap/php_http.c:1.99 php-src/ext/soap/php_http.c:1.100 --- php-src/ext/soap/php_http.c:1.99 Mon Jan 1 09:29:29 2007 +++ php-src/ext/soap/php_http.c Wed Jan 17 00:22:48 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_http.c,v 1.99 2007/01/01 09:29:29 sebastian Exp $ */ +/* $Id: php_http.c,v 1.100 2007/01/17 00:22:48 pollita Exp $ */ #include "php_soap.h" #include "ext/standard/base64.h" @@ -318,12 +318,12 @@ } old_allow_url_fopen = PG(allow_url_fopen); - PG(allow_url_fopen) = 1; + zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"), "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); if (use_ssl && php_stream_locate_url_wrapper("https://", NULL, STREAM_LOCATE_WRAPPERS_ONLY TSRMLS_CC) == NULL) { php_url_free(phpurl); if (request != buf) {efree(request);} add_soap_fault(this_ptr, "HTTP", "SSL support is not available in this build", NULL, NULL TSRMLS_CC); - PG(allow_url_fopen) = old_allow_url_fopen; + zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"), old_allow_url_fopen ? "1" : "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); return FALSE; } @@ -376,11 +376,11 @@ php_url_free(phpurl); if (request != buf) {efree(request);} add_soap_fault(this_ptr, "HTTP", "Could not connect to host", NULL, NULL TSRMLS_CC); - PG(allow_url_fopen) = old_allow_url_fopen; + zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"), old_allow_url_fopen ? "1" : "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); return FALSE; } } - PG(allow_url_fopen) = old_allow_url_fopen; + zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"), old_allow_url_fopen ? "1" : "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); if (stream) { if (client->url) { http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_xml.c?r1=1.30&r2=1.31&diff_format=u Index: php-src/ext/soap/php_xml.c diff -u php-src/ext/soap/php_xml.c:1.30 php-src/ext/soap/php_xml.c:1.31 --- php-src/ext/soap/php_xml.c:1.30 Mon Jan 1 09:29:29 2007 +++ php-src/ext/soap/php_xml.c Wed Jan 17 00:22:48 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_xml.c,v 1.30 2007/01/01 09:29:29 sebastian Exp $ */ +/* $Id: php_xml.c,v 1.31 2007/01/17 00:22:48 pollita Exp $ */ #include "php_soap.h" #include "libxml/parser.h" @@ -87,9 +87,9 @@ */ old_allow_url_fopen = PG(allow_url_fopen); - PG(allow_url_fopen) = 1; + zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"), "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); ctxt = xmlCreateFileParserCtxt(filename); - PG(allow_url_fopen) = old_allow_url_fopen; + zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"), old_allow_url_fopen ? "1" : "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); if (ctxt) { ctxt->keepBlanks = 0; ctxt->sax->ignorableWhitespace = soap_ignorableWhitespace;

« previous php.cvs (#42751) next »