[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Apr 19 05:31:45 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2319r2=1.2320diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2319 php-src/ChangeLog:1.2320 --- php-src/ChangeLog:1.2319Tue Apr 18 05:31:45 2006 +++ php-src/ChangeLog Wed Apr 19 05:31:44 2006 @@ -1,3 +1,77 @@ +2006-04-18 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_1) + configure.in + main/php_version.h: + Restore dev so win32 snaps can build + +2006-04-18 Sara Golemon [EMAIL PROTECTED] + +* ext/standard/file.c: + Silence compiler warnings + +* main/php_streams.h + main/streams/streams.c: + Fix copy/paste typo in php_stream_path_decode() proto + +* ZendEngine2/zend_API.c: + Fix ZTS build + +2006-04-18 Antony Dovgal [EMAIL PROTECTED] + +* ZendEngine2/zend_API.c: + binary strings exist only in unicode mode + +2006-04-18 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/sqlite/sqlite.c: + MFB51: Fixed bug #29476 (sqlite_fetch_column_types() locks the database + forever). + +* (PHP_5_1) + NEWS + ext/sqlite/sqlite.c: + Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever). + +2006-04-18 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + Fixed bug #37083 (Frequent crashs in SOAP extension with new WSDL caching + code in multithread WS). (Andrei, Dmitry) + +2006-04-18 Antony Dovgal [EMAIL PROTECTED] + +* run-tests.php: + typofix + +2006-04-18 Dmitry Stogov [EMAIL PROTECTED] + +* sapi/cgi/fastcgi.c + sapi/cgi/fastcgi.c: + Fixed SUN_LEN calculation + +* main/php_variables.c + main/php_variables.c + sapi/cgi/cgi_main.c + sapi/cgi/cgi_main.c: + Fixed memory leaks + +2006-04-18 Andrei Zmievski [EMAIL PROTECTED] + +* ext/standard/string.c: + I'm not sure what the heck people were thinking here, but it should be + fixed finally. Please test. + +* ext/standard/string.c: + Fix trim(a) bug. + +2006-04-18 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_1) + ext/session/mod_files.c: + Commit the actual fix + 2006-04-17 Ilia Alshanetsky [EMAIL PROTECTED] * ext/session/mod_files.c:
[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/cgi cgi_main.c
dmitry Tue Apr 18 06:57:55 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/sapi/cgi cgi_main.c
Log:
Fixed memory leaks
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.13r2=1.267.2.14diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.13
php-src/sapi/cgi/cgi_main.c:1.267.2.14
--- php-src/sapi/cgi/cgi_main.c:1.267.2.13 Fri Apr 7 13:45:23 2006
+++ php-src/sapi/cgi/cgi_main.c Tue Apr 18 06:57:55 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.13 2006/04/07 13:45:23 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.14 2006/04/18 06:57:55 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -433,12 +433,16 @@
{
if (PG(http_globals)[TRACK_VARS_ENV]
array_ptr != PG(http_globals)[TRACK_VARS_ENV]) {
+ zval_dtor(array_ptr);
*array_ptr = *PG(http_globals)[TRACK_VARS_ENV];
+ INIT_PZVAL(array_ptr);
zval_copy_ctor(array_ptr);
return;
} else if (PG(http_globals)[TRACK_VARS_SERVER]
array_ptr != PG(http_globals)[TRACK_VARS_SERVER]) {
+ zval_dtor(array_ptr);
*array_ptr = *PG(http_globals)[TRACK_VARS_SERVER];
+ INIT_PZVAL(array_ptr);
zval_copy_ctor(array_ptr);
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c
dmitry Tue Apr 18 06:58:10 2006 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
Fixed memory leaks
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.284r2=1.285diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.284 php-src/sapi/cgi/cgi_main.c:1.285
--- php-src/sapi/cgi/cgi_main.c:1.284 Fri Apr 7 13:45:51 2006
+++ php-src/sapi/cgi/cgi_main.c Tue Apr 18 06:58:10 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.284 2006/04/07 13:45:51 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.285 2006/04/18 06:58:10 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -412,12 +412,16 @@
{
if (PG(http_globals)[TRACK_VARS_ENV]
array_ptr != PG(http_globals)[TRACK_VARS_ENV]) {
+ zval_dtor(array_ptr);
*array_ptr = *PG(http_globals)[TRACK_VARS_ENV];
+ INIT_PZVAL(array_ptr);
zval_copy_ctor(array_ptr);
return;
} else if (PG(http_globals)[TRACK_VARS_SERVER]
array_ptr != PG(http_globals)[TRACK_VARS_SERVER]) {
+ zval_dtor(array_ptr);
*array_ptr = *PG(http_globals)[TRACK_VARS_SERVER];
+ INIT_PZVAL(array_ptr);
zval_copy_ctor(array_ptr);
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /main php_variables.c
dmitry Tue Apr 18 06:58:43 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main php_variables.c
Log:
Fixed memory leaks
http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.c?r1=1.104.2.8r2=1.104.2.9diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.104.2.8
php-src/main/php_variables.c:1.104.2.9
--- php-src/main/php_variables.c:1.104.2.8 Fri Apr 7 13:57:27 2006
+++ php-src/main/php_variables.cTue Apr 18 06:58:43 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.104.2.8 2006/04/07 13:57:27 dmitry Exp $ */
+/* $Id: php_variables.c,v 1.104.2.9 2006/04/18 06:58:43 dmitry Exp $ */
#include stdio.h
#include php.h
@@ -421,10 +421,8 @@
return;
}
- ALLOC_ZVAL(arr);
+ ALLOC_INIT_ZVAL(arr);
array_init(arr);
- arr-is_ref = 0;
- arr-refcount = 0;
/* Prepare argv */
if (SG(request_info).argc) { /* are we in cli sapi? */
@@ -470,15 +468,13 @@
}
/* prepare argc */
- ALLOC_ZVAL(argc);
+ ALLOC_INIT_ZVAL(argc);
if (SG(request_info).argc) {
Z_LVAL_P(argc) = SG(request_info).argc;
} else {
Z_LVAL_P(argc) = count;
}
Z_TYPE_P(argc) = IS_LONG;
- argc-is_ref = 0;
- argc-refcount = 0;
if (PG(register_globals) || SG(request_info).argc) {
arr-refcount++;
@@ -492,6 +488,8 @@
zend_hash_update(Z_ARRVAL_P(track_vars_array), argv,
sizeof(argv), arr, sizeof(zval *), NULL);
zend_hash_update(Z_ARRVAL_P(track_vars_array), argc,
sizeof(argc), argc, sizeof(zval *), NULL);
}
+ zval_ptr_dtor(arr);
+ zval_ptr_dtor(argc);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_variables.c
dmitry Tue Apr 18 06:58:54 2006 UTC
Modified files:
/php-src/main php_variables.c
Log:
Fixed memory leaks
http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.c?r1=1.125r2=1.126diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.125 php-src/main/php_variables.c:1.126
--- php-src/main/php_variables.c:1.125 Mon Apr 10 15:09:15 2006
+++ php-src/main/php_variables.cTue Apr 18 06:58:54 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.125 2006/04/10 15:09:15 sniper Exp $ */
+/* $Id: php_variables.c,v 1.126 2006/04/18 06:58:54 dmitry Exp $ */
#include stdio.h
#include php.h
@@ -627,10 +627,8 @@
return;
}
- ALLOC_ZVAL(arr);
+ ALLOC_INIT_ZVAL(arr);
array_init(arr);
- arr-is_ref = 0;
- arr-refcount = 0;
/* Prepare argv */
if (SG(request_info).argc) { /* are we in cli sapi? */
@@ -670,15 +668,13 @@
}
/* prepare argc */
- ALLOC_ZVAL(argc);
+ ALLOC_INIT_ZVAL(argc);
if (SG(request_info).argc) {
Z_LVAL_P(argc) = SG(request_info).argc;
} else {
Z_LVAL_P(argc) = count;
}
Z_TYPE_P(argc) = IS_LONG;
- argc-is_ref = 0;
- argc-refcount = 0;
if (SG(request_info).argc) {
arr-refcount++;
@@ -692,6 +688,8 @@
zend_hash_update(Z_ARRVAL_P(track_vars_array), argv,
sizeof(argv), arr, sizeof(zval *), NULL);
zend_hash_update(Z_ARRVAL_P(track_vars_array), argc,
sizeof(argc), argc, sizeof(zval *), NULL);
}
+ zval_ptr_dtor(arr);
+ zval_ptr_dtor(argc);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/cgi fastcgi.c
dmitry Tue Apr 18 06:59:19 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/sapi/cgi fastcgi.c Log: Fixed SUN_LEN calculation http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.5r2=1.4.2.6diff_format=u Index: php-src/sapi/cgi/fastcgi.c diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.5 php-src/sapi/cgi/fastcgi.c:1.4.2.6 --- php-src/sapi/cgi/fastcgi.c:1.4.2.5 Sun Feb 26 10:49:50 2006 +++ php-src/sapi/cgi/fastcgi.c Tue Apr 18 06:59:19 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: fastcgi.c,v 1.4.2.5 2006/02/26 10:49:50 helly Exp $ */ +/* $Id: fastcgi.c,v 1.4.2.6 2006/04/18 06:59:19 dmitry Exp $ */ #include fastcgi.h #include php.h @@ -301,9 +301,8 @@ memset(sa.sa_unix, 0, sizeof(sa.sa_unix)); sa.sa_unix.sun_family = AF_UNIX; memcpy(sa.sa_unix.sun_path, path, path_len + 1); - sa_len = sizeof(sa.sa_unix.sun_family) + path_len; + sa_len = (size_t)(((struct sockaddr_un *)0)-sun_path) + path_len; #ifdef HAVE_SOCKADDR_UN_SUN_LEN - sa_len += sizeof(sa.sa_unix.sun_len) + 1; sa.sa_unix.sun_len = sa_len; #endif unlink(path); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi fastcgi.c
dmitry Tue Apr 18 06:59:31 2006 UTC Modified files: /php-src/sapi/cgi fastcgi.c Log: Fixed SUN_LEN calculation http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.6r2=1.7diff_format=u Index: php-src/sapi/cgi/fastcgi.c diff -u php-src/sapi/cgi/fastcgi.c:1.6 php-src/sapi/cgi/fastcgi.c:1.7 --- php-src/sapi/cgi/fastcgi.c:1.6 Sat Feb 4 23:58:22 2006 +++ php-src/sapi/cgi/fastcgi.c Tue Apr 18 06:59:31 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: fastcgi.c,v 1.6 2006/02/04 23:58:22 fmk Exp $ */ +/* $Id: fastcgi.c,v 1.7 2006/04/18 06:59:31 dmitry Exp $ */ #include fastcgi.h #include php.h @@ -301,9 +301,8 @@ memset(sa.sa_unix, 0, sizeof(sa.sa_unix)); sa.sa_unix.sun_family = AF_UNIX; memcpy(sa.sa_unix.sun_path, path, path_len + 1); - sa_len = sizeof(sa.sa_unix.sun_family) + path_len; + sa_len = (size_t)(((struct sockaddr_un *)0)-sun_path) + path_len; #ifdef HAVE_SOCKADDR_UN_SUN_LEN - sa_len += sizeof(sa.sa_unix.sun_len) + 1; sa.sa_unix.sun_len = sa_len; #endif unlink(path); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
tony2001Tue Apr 18 09:27:59 2006 UTC Modified files: /php-srcrun-tests.php Log: typofix http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.285r2=1.286diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.285 php-src/run-tests.php:1.286 --- php-src/run-tests.php:1.285 Fri Apr 14 13:48:11 2006 +++ php-src/run-tests.php Tue Apr 18 09:27:59 2006 @@ -23,7 +23,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.285 2006/04/14 13:48:11 helly Exp $ */ +/* $Id: run-tests.php,v 1.286 2006/04/18 09:27:59 tony2001 Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -390,7 +390,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.285 $'.\n; + echo '$Revision: 1.286 $'.\n; exit(1); default: echo Illegal switch specified!\n; @@ -423,7 +423,7 @@ -u Test with unicode_semantics set on. --U Test in unicode and non unicde mode. +-U Test in unicode and non unicode mode. -m Test for memory leaks with Valgrind. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_sdl.c /ext/soap/tests/bugs bug37083.phpt bug37083.wsdl
dmitry Tue Apr 18 13:07:59 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/soap/tests/bugsbug37083.phpt bug37083.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #37083 (Frequent crashs in SOAP extension with new WSDL caching
code in multithread WS). (Andrei, Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.518r2=1.2027.2.519diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.518 php-src/NEWS:1.2027.2.519
--- php-src/NEWS:1.2027.2.518 Mon Apr 17 23:28:02 2006
+++ php-src/NEWSTue Apr 18 13:07:59 2006
@@ -2,6 +2,8 @@
|||
?? Apr 2006, PHP 5.1.3
- Fixed bug #37103 (libmbfl headers not installed). (Jani)
+- Fixed bug #37083 (Frequent crashs in SOAP extension with new WSDL caching
+ code in multithread WS). (Andrei, Dmitry)
- Fixed bug #37062 (compile failure on ARM architecture). (Tony)
- Fixed bug #37061 (curl_exec() doesn't zero-terminate binary strings). (Tony)
- Fixed bug #37060 (Type of retval of Countable::count() is not checked).
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.10r2=1.88.2.11diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.10
php-src/ext/soap/php_sdl.c:1.88.2.11
--- php-src/ext/soap/php_sdl.c:1.88.2.10Mon Apr 17 16:08:08 2006
+++ php-src/ext/soap/php_sdl.c Tue Apr 18 13:07:59 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.10 2006/04/17 16:08:08 andrei Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.11 2006/04/18 13:07:59 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -143,13 +143,18 @@
enc = get_encoder_ex(NULL, enc_nscat, enc_len);
efree(enc_nscat);
if (enc sdl) {
- encodePtr new_enc = emalloc(sizeof(encode));
+ encodePtr new_enc = pemalloc(sizeof(encode),
sdl-is_persistent);
memcpy(new_enc, enc, sizeof(encode));
- new_enc-details.ns = estrndup(ns, ns_len);
- new_enc-details.type_str =
estrdup(new_enc-details.type_str);
+ if (sdl-is_persistent) {
+ new_enc-details.ns = zend_strndup(ns, ns_len);
+ new_enc-details.type_str =
strdup(new_enc-details.type_str);
+ } else {
+ new_enc-details.ns = estrndup(ns, ns_len);
+ new_enc-details.type_str =
estrdup(new_enc-details.type_str);
+ }
if (sdl-encoders == NULL) {
- sdl-encoders = emalloc(sizeof(HashTable));
- zend_hash_init(sdl-encoders, 0, NULL,
delete_encoder, 0);
+ sdl-encoders = pemalloc(sizeof(HashTable),
sdl-is_persistent);
+ zend_hash_init(sdl-encoders, 0, NULL,
delete_encoder, sdl-is_persistent);
}
zend_hash_update(sdl-encoders, nscat, len + 1,
new_enc, sizeof(encodePtr), NULL);
enc = new_enc;
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug37083.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug37083.phpt
+++ php-src/ext/soap/tests/bugs/bug37083.phpt
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug37083.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug37083.wsdl
+++ php-src/ext/soap/tests/bugs/bug37083.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c /ext/soap/tests/bugs bug37083.phpt bug37083.wsdl
dmitry Tue Apr 18 13:08:11 2006 UTC
Modified files:
/php-src/ext/soap php_sdl.c
/php-src/ext/soap/tests/bugsbug37083.phpt bug37083.wsdl
Log:
Fixed bug #37083 (Frequent crashs in SOAP extension with new WSDL caching
code in multithread WS). (Andrei, Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.98r2=1.99diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.98 php-src/ext/soap/php_sdl.c:1.99
--- php-src/ext/soap/php_sdl.c:1.98 Mon Apr 17 16:09:42 2006
+++ php-src/ext/soap/php_sdl.c Tue Apr 18 13:08:11 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.98 2006/04/17 16:09:42 andrei Exp $ */
+/* $Id: php_sdl.c,v 1.99 2006/04/18 13:08:11 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -143,13 +143,18 @@
enc = get_encoder_ex(NULL, enc_nscat, enc_len);
efree(enc_nscat);
if (enc sdl) {
- encodePtr new_enc = emalloc(sizeof(encode));
+ encodePtr new_enc = pemalloc(sizeof(encode),
sdl-is_persistent);
memcpy(new_enc, enc, sizeof(encode));
- new_enc-details.ns = estrndup(ns, ns_len);
- new_enc-details.type_str =
estrdup(new_enc-details.type_str);
+ if (sdl-is_persistent) {
+ new_enc-details.ns = zend_strndup(ns, ns_len);
+ new_enc-details.type_str =
strdup(new_enc-details.type_str);
+ } else {
+ new_enc-details.ns = estrndup(ns, ns_len);
+ new_enc-details.type_str =
estrdup(new_enc-details.type_str);
+ }
if (sdl-encoders == NULL) {
- sdl-encoders = emalloc(sizeof(HashTable));
- zend_hash_init(sdl-encoders, 0, NULL,
delete_encoder, 0);
+ sdl-encoders = pemalloc(sizeof(HashTable),
sdl-is_persistent);
+ zend_hash_init(sdl-encoders, 0, NULL,
delete_encoder, sdl-is_persistent);
}
zend_hash_update(sdl-encoders, nscat, len + 1,
new_enc, sizeof(encodePtr), NULL);
enc = new_enc;
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug37083.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug37083.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug37083.phpt:1.2
--- /dev/null Tue Apr 18 13:08:11 2006
+++ php-src/ext/soap/tests/bugs/bug37083.phpt Tue Apr 18 13:08:11 2006
@@ -0,0 +1,58 @@
+--TEST--
+Bug #37083 (Frequent crashs in SOAP extension with new WSDL caching code in
multithread WS)
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+?php
+class TestSoapClient extends SoapClient {
+ function __doRequest($request, $location, $action, $version) {
+ return EOF
+?xml version=1.0 encoding=utf-8?
+soapenv:Envelope xmlns:soapenv=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+soapenv:Body
+ns1:searchResponse
soapenv:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;
xmlns:ns1=urn:java:de.pangaea.metadataportal.search.SearchService
+searchReturn href=#id0/
+/ns1:searchResponse
+multiRef id=id0 soapenc:root=0
soapenv:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;
xsi:type=ns2:SearchResponse
xmlns:soapenc=http://schemas.xmlsoap.org/soap/encoding/;
xmlns:ns2=urn:java:de.pangaea.metadataportal.search.SearchServiceoffset
xsi:type=xsd:int0/offsetqueryTime
xsi:type=xsd:long34/queryTimeresults
soapenc:arrayType=ns2:SearchResponseItem[10]
xsi:type=soapenc:Arrayresults href=#id1/results href=#id2/results
href=#id3/results href=#id4/results href=#id5/results
href=#id6/results href=#id7/results href=#id8/results
href=#id9/results href=#id10//resultstotalCount
xsi:type=xsd:int3501/totalCount/multiRef
+multiRef id=id9 soapenc:root=0
soapenv:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;
xsi:type=ns3:SearchResponseItem
xmlns:ns3=urn:java:de.pangaea.metadataportal.search.SearchService
xmlns:soapenc=http://schemas.xmlsoap.org/soap/encoding/;fields
href=#id11/identifier
xsi:type=xsd:stringoai:dlmd.ifremer.fr:5900168/identifierscore
xsi:type=xsd:float0.13684115/scorexml
xsi:type=xsd:stringxml1/xml/multiRef
+multiRef id=id7 soapenc:root=0
soapenv:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;
xsi:type=ns4:SearchResponseItem
xmlns:ns4=urn:java:de.pangaea.metadataportal.search.SearchService
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/sqlite sqlite.c
iliaa Tue Apr 18 14:30:16 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/sqlite sqlite.c
/php-srcNEWS
Log:
Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever).
http://cvs.php.net/viewcvs.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.12r2=1.166.2.13diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.12
php-src/ext/sqlite/sqlite.c:1.166.2.13
--- php-src/ext/sqlite/sqlite.c:1.166.2.12 Wed Mar 29 14:28:42 2006
+++ php-src/ext/sqlite/sqlite.c Tue Apr 18 14:30:15 2006
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.166.2.12 2006/03/29 14:28:42 tony2001 Exp $
+ $Id: sqlite.c,v 1.166.2.13 2006/04/18 14:30:15 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1124,7 +1124,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.12 2006/03/29 14:28:42
tony2001 Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.13 2006/04/18 14:30:15
iliaa Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1705,7 +1705,9 @@
add_index_string(return_value, i, colnames[ncols + i] ?
(char *)colnames[ncols + i] : , 1);
}
}
-
+ if (res.vm) {
+ sqlite_finalize(res.vm, NULL);
+ }
done:
sqlite_exec(db-db, PRAGMA show_datatypes = OFF, NULL, NULL, NULL);
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.519r2=1.2027.2.520diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.519 php-src/NEWS:1.2027.2.520
--- php-src/NEWS:1.2027.2.519 Tue Apr 18 13:07:59 2006
+++ php-src/NEWSTue Apr 18 14:30:16 2006
@@ -24,6 +24,8 @@
- Fixed Bug #36872 (session_destroy() fails after call to
session_regenerate_id(true)). (Ilia)
- Fixed bug #36513 (comment will be outputed in last line). (Dmitry)
+- Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever).
+ (Ilia)
06 Apr 2006, PHP 5.1.3RC3
- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
iliaa Tue Apr 18 14:30:33 2006 UTC
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
MFB51: Fixed bug #29476 (sqlite_fetch_column_types() locks the database
forever).
http://cvs.php.net/viewcvs.cgi/php-src/ext/sqlite/sqlite.c?r1=1.190r2=1.191diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.190 php-src/ext/sqlite/sqlite.c:1.191
--- php-src/ext/sqlite/sqlite.c:1.190 Sat Apr 15 15:55:32 2006
+++ php-src/ext/sqlite/sqlite.c Tue Apr 18 14:30:33 2006
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.190 2006/04/15 15:55:32 tony2001 Exp $
+ $Id: sqlite.c,v 1.191 2006/04/18 14:30:33 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1123,7 +1123,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.190 2006/04/15 15:55:32 tony2001
Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.191 2006/04/18 14:30:33 iliaa Exp
$);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1701,7 +1701,9 @@
}
efree(colname);
}
-
+ if (res.vm) {
+ sqlite_finalize(res.vm, NULL);
+ }
done:
sqlite_exec(db-db, PRAGMA show_datatypes = OFF, NULL, NULL, NULL);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_streams.h /main/streams streams.c
pollita Tue Apr 18 19:09:31 2006 UTC
Modified files:
/php-src/main php_streams.h
/php-src/main/streams streams.c
Log:
Fix copy/paste typo in php_stream_path_decode() proto
http://cvs.php.net/viewcvs.cgi/php-src/main/php_streams.h?r1=1.111r2=1.112diff_format=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.111 php-src/main/php_streams.h:1.112
--- php-src/main/php_streams.h:1.111Fri Mar 31 22:51:37 2006
+++ php-src/main/php_streams.h Tue Apr 18 19:09:31 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_streams.h,v 1.111 2006/03/31 22:51:37 pollita Exp $ */
+/* $Id: php_streams.h,v 1.112 2006/04/18 19:09:31 pollita Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -380,7 +380,7 @@
_php_stream_path_encode((wrapper), (pathenc), (pathenc_len),
(path), (path_len), (options), (context) TSRMLS_CC)
PHPAPI int _php_stream_path_decode(php_stream_wrapper *wrapper,
- char **pathdec, int *pathdec_len, UChar *path,
int path_len,
+ UChar **pathdec, int *pathdec_len, char *path,
int path_len,
int options, php_stream_context *context
TSRMLS_DC);
#define php_stream_path_decode(wrapper, pathdec, pathdec_len, path, path_len,
options, context) \
_php_stream_path_decode((wrapper), (pathdec), (pathdec_len),
(path), (path_len), (options), (context) TSRMLS_CC)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.120r2=1.121diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.120
php-src/main/streams/streams.c:1.121
--- php-src/main/streams/streams.c:1.120Wed Apr 12 22:40:56 2006
+++ php-src/main/streams/streams.c Tue Apr 18 19:09:31 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.120 2006/04/12 22:40:56 pollita Exp $ */
+/* $Id: streams.c,v 1.121 2006/04/18 19:09:31 pollita Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -2653,7 +2653,7 @@
Otherwise (or if wrapper == NULL) the INI defined filesystem_encoding
converter will be used.
*/
PHPAPI int _php_stream_path_decode(php_stream_wrapper *wrapper,
- char **pathdec, int *pathdec_len, UChar *path,
int path_len,
+ UChar **pathdec, int *pathdec_len, char *path,
int path_len,
int options, php_stream_context *context
TSRMLS_DC)
{
int num_conv;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
pollita Tue Apr 18 19:10:12 2006 UTC
Modified files:
/php-src/ext/standard file.c
Log:
Silence compiler warnings
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.436r2=1.437diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.436 php-src/ext/standard/file.c:1.437
--- php-src/ext/standard/file.c:1.436 Fri Apr 14 17:44:56 2006
+++ php-src/ext/standard/file.c Tue Apr 18 19:10:12 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.436 2006/04/14 17:44:56 pollita Exp $ */
+/* $Id: file.c,v 1.437 2006/04/18 19:10:12 pollita Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -504,7 +504,7 @@
char *filename;
int filename_len;
zend_uchar filename_type;
- char *contents;
+ void *contents;
long flags = 0;
zend_bool use_include_path = 0;
php_stream *stream;
@@ -522,7 +522,7 @@
context = php_stream_context_from_zval(zcontext, 0);
if (filename_type == IS_UNICODE) {
- if (php_stream_path_encode(NULL, filename, filename_len,
filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
+ if (php_stream_path_encode(NULL, filename, filename_len,
(UChar*)filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
RETURN_FALSE;
}
}
@@ -599,7 +599,7 @@
}
if (filename_type == IS_UNICODE) {
- if (php_stream_path_encode(NULL, filename, filename_len,
filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
+ if (php_stream_path_encode(NULL, filename, filename_len,
(UChar*)filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
RETURN_FALSE;
}
}
@@ -907,7 +907,7 @@
context = php_stream_context_from_zval(zcontext, 0);
if (filename_type == IS_UNICODE) {
- if (php_stream_path_encode(NULL, filename, filename_len,
filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
+ if (php_stream_path_encode(NULL, filename, filename_len,
(UChar*)filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
RETURN_FALSE;
}
}
@@ -1438,7 +1438,7 @@
}
if (filename_type == IS_UNICODE) {
- if (php_stream_path_encode(NULL, filename, filename_len,
filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
+ if (php_stream_path_encode(NULL, filename, filename_len,
(UChar*)filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
RETURN_FALSE;
}
}
@@ -1561,7 +1561,7 @@
context = php_stream_context_from_zval(zcontext, 0);
if (filename_type == IS_UNICODE) {
- if (php_stream_path_encode(NULL, filename, filename_len,
filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
+ if (php_stream_path_encode(NULL, filename, filename_len,
(UChar*)filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
RETURN_FALSE;
}
}
@@ -2333,7 +2333,7 @@
}
if (filename_type == IS_UNICODE) {
- if (php_stream_path_encode(php_plain_files_wrapper, filename,
filename_len, filename, filename_len, REPORT_ERRORS, FG(default_context)) ==
FAILURE) {
+ if (php_stream_path_encode(php_plain_files_wrapper, filename,
filename_len, (UChar*)filename, filename_len, REPORT_ERRORS,
FG(default_context)) == FAILURE) {
RETURN_FALSE;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/unicode locale.c
andrei Tue Apr 18 21:36:38 2006 UTC
Modified files:
/php-src/ext/unicodelocale.c
Log:
Update protos.
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/locale.c?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/unicode/locale.c
diff -u php-src/ext/unicode/locale.c:1.7 php-src/ext/unicode/locale.c:1.8
--- php-src/ext/unicode/locale.c:1.7Wed Mar 22 10:20:20 2006
+++ php-src/ext/unicode/locale.cTue Apr 18 21:36:38 2006
@@ -14,7 +14,7 @@
+--+
*/
-/* $Id: locale.c,v 1.7 2006/03/22 10:20:20 derick Exp $ */
+/* $Id: locale.c,v 1.8 2006/04/18 21:36:38 andrei Exp $ */
#include php_unicode.h
@@ -40,6 +40,8 @@
*target_len = canonicalized_len;
}
+/* {{{ proto string i18n_loc_get_default(void) U
+ Returns default locale */
PHP_FUNCTION(i18n_loc_get_default)
{
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ) == FAILURE) {
@@ -48,7 +50,10 @@
RETURN_STRING(UG(default_locale), 1);
}
+/* }}} */
+/* {{{ proto bool i18n_loc_set_default(string locale) U
+ Sets default locale */
PHP_FUNCTION(i18n_loc_set_default)
{
char *locale;
@@ -63,7 +68,8 @@
php_canonicalize_locale_id(canonicalized, locale_len, locale,
status);
/*
* UTODO: is this right? canonicalization does not seem to perform
locale
-* validation.
+* validation. See this for possible solution:
+* http://sourceforge.net/mailarchive/message.php?msg_id=11953411
*/
if (U_FAILURE(status)) {
php_error(E_WARNING, Invalid locale: %s, locale);
@@ -79,6 +85,8 @@
zend_reset_locale_deps(TSRMLS_C);
RETURN_TRUE;
}
+/* }}} */
+
#endif /* HAVE_UNICODE */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/unicode locale.c
I'd say i18n_loc_get_default() and i18n_loc_set_default() are the ugliest names
I've ever saw =)
default_locale_set() and default_locale_get() would be MUCH more readable and
clear.
On 19.04.2006 01:36, Andrei Zmievski wrote:
andrei Tue Apr 18 21:36:38 2006 UTC
Modified files:
/php-src/ext/unicode locale.c
Log:
Update protos.
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/locale.c?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/unicode/locale.c
diff -u php-src/ext/unicode/locale.c:1.7 php-src/ext/unicode/locale.c:1.8
--- php-src/ext/unicode/locale.c:1.7Wed Mar 22 10:20:20 2006
+++ php-src/ext/unicode/locale.cTue Apr 18 21:36:38 2006
@@ -14,7 +14,7 @@
+--+
*/
-/* $Id: locale.c,v 1.7 2006/03/22 10:20:20 derick Exp $ */
+/* $Id: locale.c,v 1.8 2006/04/18 21:36:38 andrei Exp $ */
#include php_unicode.h
@@ -40,6 +40,8 @@
*target_len = canonicalized_len;
}
+/* {{{ proto string i18n_loc_get_default(void) U
+ Returns default locale */
PHP_FUNCTION(i18n_loc_get_default)
{
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ) == FAILURE) {
@@ -48,7 +50,10 @@
RETURN_STRING(UG(default_locale), 1);
}
+/* }}} */
+/* {{{ proto bool i18n_loc_set_default(string locale) U
+ Sets default locale */
PHP_FUNCTION(i18n_loc_set_default)
{
char *locale;
@@ -63,7 +68,8 @@
php_canonicalize_locale_id(canonicalized, locale_len, locale,
status);
/*
* UTODO: is this right? canonicalization does not seem to perform
locale
-* validation.
+* validation. See this for possible solution:
+* http://sourceforge.net/mailarchive/message.php?msg_id=11953411
*/
if (U_FAILURE(status)) {
php_error(E_WARNING, Invalid locale: %s, locale);
@@ -79,6 +85,8 @@
zend_reset_locale_deps(TSRMLS_C);
RETURN_TRUE;
}
+/* }}} */
+
#endif /* HAVE_UNICODE */
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / configure.in /main php_version.h
iliaa Tue Apr 18 23:47:10 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/main php_version.h /php-srcconfigure.in Log: Restore dev so win32 snaps can build http://cvs.php.net/viewcvs.cgi/php-src/main/php_version.h?r1=1.112.2.30r2=1.112.2.31diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.30 php-src/main/php_version.h:1.112.2.31 --- php-src/main/php_version.h:1.112.2.30 Fri Apr 7 14:21:13 2006 +++ php-src/main/php_version.h Tue Apr 18 23:47:10 2006 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 3 -#define PHP_EXTRA_VERSION RC3 -#define PHP_VERSION 5.1.3RC3 +#define PHP_EXTRA_VERSION RC3-dev +#define PHP_VERSION 5.1.3RC3-dev http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.579.2.45r2=1.579.2.46diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.45 php-src/configure.in:1.579.2.46 --- php-src/configure.in:1.579.2.45 Mon Apr 10 12:16:17 2006 +++ php-src/configure.inTue Apr 18 23:47:10 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.45 2006/04/10 12:16:17 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.46 2006/04/18 23:47:10 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=3 -EXTRA_VERSION=RC3 +EXTRA_VERSION=RC3-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
