[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Nov 29 01:48:40 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2178r2=1.2179ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2178 php-src/ChangeLog:1.2179 --- php-src/ChangeLog:1.2178Mon Nov 28 01:42:31 2005 +++ php-src/ChangeLog Tue Nov 29 01:48:25 2005 @@ -1,3 +1,80 @@ +2005-11-28 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + Fixed bug #35422 (strtotime() does not parse times with UTC as timezone). + +2005-11-28 Jani Taskinen [EMAIL PROTECTED] + +* ext/readline/config.m4: + fix build with libedit + +2005-11-28 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + Fixed bug #35456 (+ 1 [time unit] format did not work). + +2005-11-28 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS + ext/readline/config.m4 + ext/readline/readline.c + sapi/cli/php_cli_readline.c: + MFH: - Fixed bug #35409 (undefined reference to 'rl_completion_matches'). + +* ext/readline/config.m4 + ext/readline/readline.c + sapi/cli/php_cli_readline.c: + - Fixed bug #35409 (undefined reference to 'rl_completion_matches') + +2005-11-28 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/tests/bug35393.phpt + ZendEngine2/tests/bug35393.phpt: + + file bug35393.phpt was initially added on branch PHP_5_1. + +* (PHP_5_1) + NEWS + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/tests/bug35393.phpt + ext/standard/tests/file/proc_open01.phpt + ext/standard/tests/file/proc_open01.phpt: + Fixed bug #35393 (changing static protected members from outside the class, + one more reference issue) + +2005-11-28 Andrey Hristov [EMAIL PROTECTED] + +* (PHP_5_1) + ext/mysqli/tests/009.phpt: + mysql 4.1.x gives strange result. the result in the test is generated with + 5.0.16 (valid for 5.1.3). + +2005-11-28 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS + ext/openssl/openssl.c: + MFH: - Fixed bug #35381 (ssl library is not initialized properly) + +2005-11-28 Alan Knowles [EMAIL PROTECTED] + +* ext/openssl/openssl.c: + fix bug #35381 - ensure library is initialized before use + +2005-11-28 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_0) + NEWS + NEWS: + Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of + soapenc:base64binary fails) + 2005-11-27 Jani Taskinen [EMAIL PROTECTED] * (PHP_5_1) @@ -17516,7 +17593,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2178 2005/11/28 06:42:31 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2179 2005/11/29 06:48:25 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -20917,7 +20994,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2178 2005/11/28 06:42:31 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2179 2005/11/29 06:48:25 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -21398,7 +21475,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2178 2005/11/28 06:42:31 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2179 2005/11/29 06:48:25 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -22872,7 +22949,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2178 2005/11/28 06:42:31 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2179 2005/11/29 06:48:25 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Nov 29 01:49:32 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.818r2=1.819ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.818 ZendEngine2/ChangeLog:1.819 --- ZendEngine2/ChangeLog:1.818 Mon Nov 28 01:43:30 2005 +++ ZendEngine2/ChangeLog Tue Nov 29 01:49:28 2005 @@ -1,3 +1,18 @@ +2005-11-28 Dmitry Stogov [EMAIL PROTECTED] + +* zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h + tests/bug35393.phpt: + Fixed bug #35393 (changing static protected members from outside the class, + one more reference issue) + +* tests/bug35393.phpt + tests/bug35393.phpt: + + file bug35393.phpt was initially added on branch PHP_5_1. + 2005-11-27 Ilia Alshanetsky [EMAIL PROTECTED] * tests/bug35411.phpt @@ -11258,7 +11273,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.818 2005/11/28 06:43:30 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.819 2005/11/29 06:49:28 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -12982,7 +12997,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.818 2005/11/28 06:43:30 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.819 2005/11/29 06:49:28 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/soap php_sdl.c
dmitry Mon Nov 28 05:07:57 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
soapenc:base64binary fails)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.522r2=1.1760.2.523ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.522 php-src/NEWS:1.1760.2.523
--- php-src/NEWS:1.1760.2.522 Thu Nov 24 06:33:26 2005
+++ php-src/NEWSMon Nov 28 05:07:51 2005
@@ -4,6 +4,8 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
+ soapenc:base64binary fails). (Dmitry)
- Fixed bug #35360 (exceptions in interactive mode (php -a) may cause crash).
(Dmitry)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.70.2.14r2=1.70.2.15ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.70.2.14
php-src/ext/soap/php_sdl.c:1.70.2.15
--- php-src/ext/soap/php_sdl.c:1.70.2.14Fri Nov 18 06:01:05 2005
+++ php-src/ext/soap/php_sdl.c Mon Nov 28 05:07:56 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.70.2.14 2005/11/18 11:01:05 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.70.2.15 2005/11/28 10:07:56 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -1289,6 +1289,40 @@
enc-details.sdl_type = types[i];
enc-to_xml = sdl_guess_convert_xml;
enc-to_zval = sdl_guess_convert_zval;
+
+ if (enc-details.sdl_type == NULL) {
+ int ns_len = strlen(enc-details.ns);
+ int type_len = strlen(enc-details.type_str);
+
+ if (((ns_len == sizeof(SOAP_1_1_ENC_NAMESPACE)-1
+ memcmp(enc-details.ns, SOAP_1_1_ENC_NAMESPACE,
sizeof(SOAP_1_1_ENC_NAMESPACE)-1) == 0) ||
+(ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1
+ memcmp(enc-details.ns, SOAP_1_2_ENC_NAMESPACE,
sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) {
+ char *enc_nscat;
+ int enc_ns_len;
+ int enc_len;
+ encodePtr real_enc;
+
+ enc_ns_len = sizeof(XSD_NAMESPACE)-1;
+ enc_len = enc_ns_len + type_len + 1;
+ enc_nscat = emalloc(enc_len + 1);
+ memcpy(enc_nscat, XSD_NAMESPACE,
sizeof(XSD_NAMESPACE)-1);
+ enc_nscat[enc_ns_len] = ':';
+ memcpy(enc_nscat+enc_ns_len+1, enc-details.type_str,
type_len);
+ enc_nscat[enc_len] = '\0';
+
+ real_enc = get_encoder_ex(NULL, enc_nscat, enc_len);
+ efree(enc_nscat);
+ if (real_enc) {
+ enc-to_zval = real_enc-to_zval;
+ enc-to_xml = real_enc-to_xml;
+ enc-to_zval_before = real_enc-to_zval_before;
+ enc-to_xml_before = real_enc-to_xml_before;
+ enc-to_zval_after = real_enc-to_zval_after;
+ enc-to_xml_after = real_enc-to_xml_after;
+ }
+ }
+ }
}
static void sdl_deserialize_soap_body(sdlSoapBindingFunctionBodyPtr body,
encodePtr *encoders, sdlTypePtr *types, char **in)
--
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
dmitry Mon Nov 28 05:08:35 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
soapenc:base64binary fails)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.237r2=1.2027.2.238ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.237 php-src/NEWS:1.2027.2.238
--- php-src/NEWS:1.2027.2.237 Sun Nov 27 16:17:17 2005
+++ php-src/NEWSMon Nov 28 05:08:30 2005
@@ -3,6 +3,8 @@
?? ??? 200?, PHP 5.1.2
- Fixed bug #35431 (PDO crashes when using LAZY fetch with fetchAll). (Wez)
- Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony)
+- Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
+ soapenc:base64binary fails). (Dmitry)
28 Nov 2005, PHP 5.1.1
- Disabled native date class to prevent pear::date conflict. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.88.2.2r2=1.88.2.3ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.2 php-src/ext/soap/php_sdl.c:1.88.2.3
--- php-src/ext/soap/php_sdl.c:1.88.2.2 Fri Nov 18 06:00:15 2005
+++ php-src/ext/soap/php_sdl.c Mon Nov 28 05:08:34 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.2 2005/11/18 11:00:15 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.3 2005/11/28 10:08:34 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -1289,6 +1289,40 @@
enc-details.sdl_type = types[i];
enc-to_xml = sdl_guess_convert_xml;
enc-to_zval = sdl_guess_convert_zval;
+
+ if (enc-details.sdl_type == NULL) {
+ int ns_len = strlen(enc-details.ns);
+ int type_len = strlen(enc-details.type_str);
+
+ if (((ns_len == sizeof(SOAP_1_1_ENC_NAMESPACE)-1
+ memcmp(enc-details.ns, SOAP_1_1_ENC_NAMESPACE,
sizeof(SOAP_1_1_ENC_NAMESPACE)-1) == 0) ||
+(ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1
+ memcmp(enc-details.ns, SOAP_1_2_ENC_NAMESPACE,
sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) {
+ char *enc_nscat;
+ int enc_ns_len;
+ int enc_len;
+ encodePtr real_enc;
+
+ enc_ns_len = sizeof(XSD_NAMESPACE)-1;
+ enc_len = enc_ns_len + type_len + 1;
+ enc_nscat = emalloc(enc_len + 1);
+ memcpy(enc_nscat, XSD_NAMESPACE,
sizeof(XSD_NAMESPACE)-1);
+ enc_nscat[enc_ns_len] = ':';
+ memcpy(enc_nscat+enc_ns_len+1, enc-details.type_str,
type_len);
+ enc_nscat[enc_len] = '\0';
+
+ real_enc = get_encoder_ex(NULL, enc_nscat, enc_len);
+ efree(enc_nscat);
+ if (real_enc) {
+ enc-to_zval = real_enc-to_zval;
+ enc-to_xml = real_enc-to_xml;
+ enc-to_zval_before = real_enc-to_zval_before;
+ enc-to_xml_before = real_enc-to_xml_before;
+ enc-to_zval_after = real_enc-to_zval_after;
+ enc-to_xml_after = real_enc-to_xml_after;
+ }
+ }
+ }
}
static void sdl_deserialize_soap_body(sdlSoapBindingFunctionBodyPtr body,
encodePtr *encoders, sdlTypePtr *types, char **in)
--
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
dmitry Mon Nov 28 05:09:10 2005 EDT
Modified files:
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
soapenc:base64binary fails)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.90r2=1.91ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.90 php-src/ext/soap/php_sdl.c:1.91
--- php-src/ext/soap/php_sdl.c:1.90 Fri Nov 18 05:59:51 2005
+++ php-src/ext/soap/php_sdl.c Mon Nov 28 05:09:07 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.90 2005/11/18 10:59:51 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.91 2005/11/28 10:09:07 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -1289,6 +1289,40 @@
enc-details.sdl_type = types[i];
enc-to_xml = sdl_guess_convert_xml;
enc-to_zval = sdl_guess_convert_zval;
+
+ if (enc-details.sdl_type == NULL) {
+ int ns_len = strlen(enc-details.ns);
+ int type_len = strlen(enc-details.type_str);
+
+ if (((ns_len == sizeof(SOAP_1_1_ENC_NAMESPACE)-1
+ memcmp(enc-details.ns, SOAP_1_1_ENC_NAMESPACE,
sizeof(SOAP_1_1_ENC_NAMESPACE)-1) == 0) ||
+(ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1
+ memcmp(enc-details.ns, SOAP_1_2_ENC_NAMESPACE,
sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) {
+ char *enc_nscat;
+ int enc_ns_len;
+ int enc_len;
+ encodePtr real_enc;
+
+ enc_ns_len = sizeof(XSD_NAMESPACE)-1;
+ enc_len = enc_ns_len + type_len + 1;
+ enc_nscat = emalloc(enc_len + 1);
+ memcpy(enc_nscat, XSD_NAMESPACE,
sizeof(XSD_NAMESPACE)-1);
+ enc_nscat[enc_ns_len] = ':';
+ memcpy(enc_nscat+enc_ns_len+1, enc-details.type_str,
type_len);
+ enc_nscat[enc_len] = '\0';
+
+ real_enc = get_encoder_ex(NULL, enc_nscat, enc_len);
+ efree(enc_nscat);
+ if (real_enc) {
+ enc-to_zval = real_enc-to_zval;
+ enc-to_xml = real_enc-to_xml;
+ enc-to_zval_before = real_enc-to_zval_before;
+ enc-to_xml_before = real_enc-to_xml_before;
+ enc-to_zval_after = real_enc-to_zval_after;
+ enc-to_xml_after = real_enc-to_xml_after;
+ }
+ }
+ }
}
static void sdl_deserialize_soap_body(sdlSoapBindingFunctionBodyPtr body,
encodePtr *encoders, sdlTypePtr *types, char **in)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
alan_k Mon Nov 28 05:28:18 2005 EDT Modified files: /php-src/ext/opensslopenssl.c Log: fix bug #35381 - ensure library is initialized before use http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.99r2=1.100ty=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.99 php-src/ext/openssl/openssl.c:1.100 --- php-src/ext/openssl/openssl.c:1.99 Thu Aug 18 09:33:58 2005 +++ php-src/ext/openssl/openssl.c Mon Nov 28 05:28:16 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: openssl.c,v 1.99 2005/08/18 13:33:58 sniper Exp $ */ +/* $Id: openssl.c,v 1.100 2005/11/28 10:28:16 alan_k Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -584,6 +584,7 @@ le_x509 = zend_register_list_destructors_ex(php_x509_free, NULL, OpenSSL X.509, module_number); le_csr = zend_register_list_destructors_ex(php_csr_free, NULL, OpenSSL X.509 CSR, module_number); + SSL_library_init(); OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); OpenSSL_add_all_algorithms(); -- 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/openssl openssl.c
sniper Mon Nov 28 06:37:45 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS /php-src/ext/opensslopenssl.c Log: MFH: - Fixed bug #35381 (ssl library is not initialized properly) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.238r2=1.2027.2.239ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.238 php-src/NEWS:1.2027.2.239 --- php-src/NEWS:1.2027.2.238 Mon Nov 28 05:08:30 2005 +++ php-src/NEWSMon Nov 28 06:37:40 2005 @@ -5,6 +5,7 @@ - Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony) - Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of soapenc:base64binary fails). (Dmitry) +- Fixed bug #35381 (ssl library is not initialized properly). (Alan) 28 Nov 2005, PHP 5.1.1 - Disabled native date class to prevent pear::date conflict. (Ilia) http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.98.2.1r2=1.98.2.2ty=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.1 php-src/ext/openssl/openssl.c:1.98.2.2 --- php-src/ext/openssl/openssl.c:1.98.2.1 Thu Aug 18 09:34:37 2005 +++ php-src/ext/openssl/openssl.c Mon Nov 28 06:37:43 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: openssl.c,v 1.98.2.1 2005/08/18 13:34:37 sniper Exp $ */ +/* $Id: openssl.c,v 1.98.2.2 2005/11/28 11:37:43 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -584,6 +584,7 @@ le_x509 = zend_register_list_destructors_ex(php_x509_free, NULL, OpenSSL X.509, module_number); le_csr = zend_register_list_destructors_ex(php_csr_free, NULL, OpenSSL X.509 CSR, module_number); + SSL_library_init(); OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); OpenSSL_add_all_algorithms(); -- 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) /ext/mysqli/tests 009.phpt
andrey Mon Nov 28 08:35:56 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli/tests 009.phpt
Log:
mysql 4.1.x gives strange result. the result in the test is generated with
5.0.16 (valid for 5.1.3).
http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/009.phpt?r1=1.6.2.6r2=1.6.2.7ty=u
Index: php-src/ext/mysqli/tests/009.phpt
diff -u php-src/ext/mysqli/tests/009.phpt:1.6.2.6
php-src/ext/mysqli/tests/009.phpt:1.6.2.7
--- php-src/ext/mysqli/tests/009.phpt:1.6.2.6 Thu Nov 24 20:13:56 2005
+++ php-src/ext/mysqli/tests/009.phpt Mon Nov 28 08:35:54 2005
@@ -1,5 +1,5 @@
--TEST--
-mysqli fetch bigint values
+mysqli fetch bigint values (ok to fail with 4.1.x)
--SKIPIF--
?php
if (PHP_INT_SIZE == 8) {
--
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) /ext/standard/tests/file proc_open01.phpt
dmitry Mon Nov 28 09:33:03 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard/tests/fileproc_open01.phpt
Log:
Fixed bug #35393 (changing static protected members from outside the class,
one more reference issue)
http://cvs.php.net/diff.php/php-src/ext/standard/tests/file/proc_open01.phpt?r1=1.3r2=1.3.4.1ty=u
Index: php-src/ext/standard/tests/file/proc_open01.phpt
diff -u php-src/ext/standard/tests/file/proc_open01.phpt:1.3
php-src/ext/standard/tests/file/proc_open01.phpt:1.3.4.1
--- php-src/ext/standard/tests/file/proc_open01.phpt:1.3Tue Jul 15
13:28:41 2003
+++ php-src/ext/standard/tests/file/proc_open01.phptMon Nov 28 09:33:03 2005
@@ -30,7 +30,9 @@
break;
}
$read_fds = array($pipes[1]);
- $retval = stream_select($read_fds, $write_fds = NULL, $exp_fds = NULL,
1);
+ $write_fds = NULL;
+ $exp_fds = NULL;
+ $retval = stream_select($read_fds, $write_fds, $exp_fds, 1);
if ($retval === false) {
print select() failed\n;
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file proc_open01.phpt
dmitry Mon Nov 28 09:33:45 2005 EDT
Modified files:
/php-src/ext/standard/tests/fileproc_open01.phpt
Log:
Fixed bug #35393 (changing static protected members from outside the class,
one more reference issue)
http://cvs.php.net/diff.php/php-src/ext/standard/tests/file/proc_open01.phpt?r1=1.3r2=1.4ty=u
Index: php-src/ext/standard/tests/file/proc_open01.phpt
diff -u php-src/ext/standard/tests/file/proc_open01.phpt:1.3
php-src/ext/standard/tests/file/proc_open01.phpt:1.4
--- php-src/ext/standard/tests/file/proc_open01.phpt:1.3Tue Jul 15
13:28:41 2003
+++ php-src/ext/standard/tests/file/proc_open01.phptMon Nov 28 09:33:44 2005
@@ -30,7 +30,9 @@
break;
}
$read_fds = array($pipes[1]);
- $retval = stream_select($read_fds, $write_fds = NULL, $exp_fds = NULL,
1);
+ $write_fds = NULL;
+ $exp_fds = NULL;
+ $retval = stream_select($read_fds, $write_fds, $exp_fds, 1);
if ($retval === false) {
print select() failed\n;
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/readline config.m4 readline.c /sapi/cli php_cli_readline.c
sniper Mon Nov 28 11:49:35 2005 EDT
Modified files:
/php-src/sapi/cli php_cli_readline.c
/php-src/ext/readline config.m4 readline.c
Log:
- Fixed bug #35409 (undefined reference to 'rl_completion_matches')
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli_readline.c?r1=1.6r2=1.7ty=u
Index: php-src/sapi/cli/php_cli_readline.c
diff -u php-src/sapi/cli/php_cli_readline.c:1.6
php-src/sapi/cli/php_cli_readline.c:1.7
--- php-src/sapi/cli/php_cli_readline.c:1.6 Thu Nov 17 03:36:12 2005
+++ php-src/sapi/cli/php_cli_readline.c Mon Nov 28 11:49:35 2005
@@ -17,12 +17,16 @@
+--+
*/
-/* $Id: php_cli_readline.c,v 1.6 2005/11/17 08:36:12 sniper Exp $ */
+/* $Id: php_cli_readline.c,v 1.7 2005/11/28 16:49:35 sniper Exp $ */
#include php.h
#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) !defined(COMPILE_DL_READLINE)
+#ifndef HAVE_RL_COMPLETION_MATCHES
+#define rl_completion_matches completion_matches
+#endif
+
#include php_globals.h
#include php_variables.h
#include zend_hash.h
http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.26r2=1.27ty=u
Index: php-src/ext/readline/config.m4
diff -u php-src/ext/readline/config.m4:1.26 php-src/ext/readline/config.m4:1.27
--- php-src/ext/readline/config.m4:1.26 Fri Nov 18 10:11:14 2005
+++ php-src/ext/readline/config.m4 Mon Nov 28 11:49:35 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.26 2005/11/18 15:11:14 sniper Exp $
+dnl $Id: config.m4,v 1.27 2005/11/28 16:49:35 sniper Exp $
dnl
PHP_ARG_WITH(libedit,for libedit readline replacement,
@@ -59,8 +59,6 @@
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
])
- PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
- PHP_SUBST(READLINE_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
elif test $PHP_LIBEDIT != no; then
@@ -94,7 +92,11 @@
-L$READLINE_DIR/$PHP_LIBDIR
])
+ AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
+fi
+
+if test $PHP_READLINE != no || test $PHP_LIBEDIT != no; then
+ AC_CHECK_FUNCS([rl_completion_matches])
PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
PHP_SUBST(READLINE_SHARED_LIBADD)
- AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
fi
http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.43r2=1.44ty=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.43
php-src/ext/readline/readline.c:1.44
--- php-src/ext/readline/readline.c:1.43Mon Aug 22 08:22:11 2005
+++ php-src/ext/readline/readline.c Mon Nov 28 11:49:35 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: readline.c,v 1.43 2005/08/22 12:22:11 dmitry Exp $ */
+/* $Id: readline.c,v 1.44 2005/11/28 16:49:35 sniper Exp $ */
/* {{{ includes prototypes */
@@ -29,6 +29,10 @@
#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#ifndef HAVE_RL_COMPLETION_MATCHES
+#define rl_completion_matches completion_matches
+#endif
+
#include readline/readline.h
#ifndef HAVE_LIBEDIT
#include readline/history.h
@@ -421,7 +425,7 @@
if (call_user_function(CG(function_table), NULL, _readline_completion,
_readline_array, 3, params TSRMLS_CC) == SUCCESS) {
if (Z_TYPE(_readline_array) == IS_ARRAY) {
if (zend_hash_num_elements(Z_ARRVAL(_readline_array))) {
- matches =
completion_matches(text,_readline_command_generator);
+ matches =
rl_completion_matches(text,_readline_command_generator);
} else {
matches = malloc(sizeof(char *) * 2);
matches[0] = strdup();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/readline config.m4
sniper Mon Nov 28 18:03:51 2005 EDT Modified files: /php-src/ext/readline config.m4 Log: fix build with libedit http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.27r2=1.28ty=u Index: php-src/ext/readline/config.m4 diff -u php-src/ext/readline/config.m4:1.27 php-src/ext/readline/config.m4:1.28 --- php-src/ext/readline/config.m4:1.27 Mon Nov 28 11:49:35 2005 +++ php-src/ext/readline/config.m4 Mon Nov 28 18:03:49 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.27 2005/11/28 16:49:35 sniper Exp $ +dnl $Id: config.m4,v 1.28 2005/11/28 23:03:49 sniper Exp $ dnl PHP_ARG_WITH(libedit,for libedit readline replacement, @@ -10,7 +10,7 @@ [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) fi -if test $PHP_READLINE != no; then +if test $PHP_READLINE test $PHP_READLINE != no; then for i in $PHP_READLINE /usr/local /usr; do test -f $i/include/readline/readline.h READLINE_DIR=$i break done -- 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) /ext/readline config.m4
sniper Mon Nov 28 18:04:01 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/readline config.m4 Log: MFH http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.25.2.2r2=1.25.2.3ty=u Index: php-src/ext/readline/config.m4 diff -u php-src/ext/readline/config.m4:1.25.2.2 php-src/ext/readline/config.m4:1.25.2.3 --- php-src/ext/readline/config.m4:1.25.2.2 Mon Nov 28 11:51:16 2005 +++ php-src/ext/readline/config.m4 Mon Nov 28 18:04:01 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.2 2005/11/28 16:51:16 sniper Exp $ +dnl $Id: config.m4,v 1.25.2.3 2005/11/28 23:04:01 sniper Exp $ dnl PHP_ARG_WITH(libedit,for libedit readline replacement, @@ -10,7 +10,7 @@ [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) fi -if test $PHP_READLINE != no; then +if test $PHP_READLINE test $PHP_READLINE != no; then for i in $PHP_READLINE /usr/local /usr; do test -f $i/include/readline/readline.h READLINE_DIR=$i break done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Mon Nov 28 18:04:19 2005 EDT Modified files: /CVSROOTavail Log: - karma for fa, pear ipv4 and dns http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1052r2=1.1053ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1052 CVSROOT/avail:1.1053 --- CVSROOT/avail:1.1052Thu Nov 24 13:20:02 2005 +++ CVSROOT/avail Mon Nov 28 18:04:17 2005 @@ -303,6 +303,7 @@ avail|mikl|pecl/memcache avail|norro|pear/Image_3D avail|ttsuruoka|pear/Services_Amazon +avail|fa|pear/Net_DNS,pear/Net_IPv4 # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- 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/date/lib timezonemap.h /ext/date/tests bug35422.phpt
iliaa Mon Nov 28 18:49:26 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/date/tests bug35422.phpt
Modified files:
/php-srcNEWS
/php-src/ext/date/lib timezonemap.h
Log:
Fixed bug #35422 (strtotime() does not parse times with UTC as timezone).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.242r2=1.2027.2.243ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.242 php-src/NEWS:1.2027.2.243
--- php-src/NEWS:1.2027.2.242 Mon Nov 28 17:23:49 2005
+++ php-src/NEWSMon Nov 28 18:49:20 2005
@@ -4,6 +4,8 @@
- Fixed bug #35456 (+ 1 [time unit] format did not work). (Ilia)
- Fixed bug #35431 (PDO crashes when using LAZY fetch with fetchAll). (Wez)
- Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony)
+- Fixed bug #35422 (strtotime() does not parse times with UTC as timezone).
+ (Ilia)
- Fixed bug #35409 (undefined reference to 'rl_completion_matches'). (Jani)
- Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
soapenc:base64binary fails). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/date/lib/timezonemap.h?r1=1.1.2.3r2=1.1.2.4ty=u
Index: php-src/ext/date/lib/timezonemap.h
diff -u php-src/ext/date/lib/timezonemap.h:1.1.2.3
php-src/ext/date/lib/timezonemap.h:1.1.2.4
--- php-src/ext/date/lib/timezonemap.h:1.1.2.3 Thu Nov 17 08:04:29 2005
+++ php-src/ext/date/lib/timezonemap.h Mon Nov 28 18:49:25 2005
@@ -885,6 +885,7 @@
{ gmt, 0, 0, GB},
{ gmt, 0, 0, GB-Eire },
{ gmt, 0, 0, GMT },
+ { utc, 0, 0, UTC },
{ gmt, 0, 0, Iceland },
{ gst, 0, 14400, Asia/Dubai},
{ gst, 0, 14400, Asia/Bahrain },
http://cvs.php.net/co.php/php-src/ext/date/tests/bug35422.phpt?r=1.1p=1
Index: php-src/ext/date/tests/bug35422.phpt
+++ php-src/ext/date/tests/bug35422.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_1) /ext/pdo_pgsql package.xml pdo_pgsql.c pgsql_driver.c pgsql_statement.c php_pdo_pgsql_int.h /ext/pdo_pgsql/tests bug_33876.phpt common.phpt config.inc large_objects.ph
wez Mon Nov 28 21:11:40 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/pdo_pgsql/testsconfig.inc large_objects.phpt
Modified files:
/php-src/ext/pdo_pgsql package.xml pdo_pgsql.c pgsql_driver.c
pgsql_statement.c php_pdo_pgsql_int.h
/php-src/ext/pdo_pgsql/testsbug_33876.phpt common.phpt
Log:
Added PDO::pgsqlLOBCreate(), PDO::pgsqlLOBOpen() and PDO::pgsqlLOBUnlink().
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/package.xml?r1=1.5.2.4r2=1.5.2.5ty=u
Index: php-src/ext/pdo_pgsql/package.xml
diff -u php-src/ext/pdo_pgsql/package.xml:1.5.2.4
php-src/ext/pdo_pgsql/package.xml:1.5.2.5
--- php-src/ext/pdo_pgsql/package.xml:1.5.2.4 Sat Nov 26 15:50:07 2005
+++ php-src/ext/pdo_pgsql/package.xml Mon Nov 28 21:11:37 2005
@@ -30,8 +30,8 @@
licensePHP/license
release
statestable/state
- version1.0/version
- date2005-11-26/date
+ version1.0.1/version
+ date2005-11-28/date
notes
Now features native prepared statements and numerous other improvements.
@@ -42,6 +42,8 @@
If you are running on windows, you can download the binary from here:
http://pecl4win.php.net/ext.php/php_pdo_pgsql.dll
+
+Added PDO::pgsqlLOBCreate(), PDO::pgsqlLOBOpen() and PDO::pgsqlLOBUnlink().
/notes
filelist
@@ -57,7 +59,7 @@
/filelist
deps
dep type=php rel=ge version=5.0.3/
- dep type=ext rel=ge name=pdo version=1.0/
+ dep type=ext rel=ge name=pdo version=1.0.2/
/deps
/release
/package
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pdo_pgsql.c?r1=1.7.2.6r2=1.7.2.7ty=u
Index: php-src/ext/pdo_pgsql/pdo_pgsql.c
diff -u php-src/ext/pdo_pgsql/pdo_pgsql.c:1.7.2.6
php-src/ext/pdo_pgsql/pdo_pgsql.c:1.7.2.7
--- php-src/ext/pdo_pgsql/pdo_pgsql.c:1.7.2.6 Sat Nov 26 15:50:08 2005
+++ php-src/ext/pdo_pgsql/pdo_pgsql.c Mon Nov 28 21:11:37 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pdo_pgsql.c,v 1.7.2.6 2005/11/26 20:50:08 wez Exp $ */
+/* $Id: pdo_pgsql.c,v 1.7.2.7 2005/11/29 02:11:37 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -61,7 +61,7 @@
PHP_RINIT(pdo_pgsql),
PHP_RSHUTDOWN(pdo_pgsql),
PHP_MINFO(pdo_pgsql),
- 1.0,
+ 1.0.1,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.53.2.1r2=1.53.2.2ty=u
Index: php-src/ext/pdo_pgsql/pgsql_driver.c
diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.1
php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.2
--- php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.1 Thu Nov 24 22:35:04 2005
+++ php-src/ext/pdo_pgsql/pgsql_driver.cMon Nov 28 21:11:37 2005
@@ -12,11 +12,13 @@
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
- | Author: Edin Kadribasic [EMAIL PROTECTED] |
+ | Authors: Edin Kadribasic [EMAIL PROTECTED]|
+ | Ilia Alshanestsky [EMAIL PROTECTED]|
+ | Wez Furlong [EMAIL PROTECTED]
|
+--+
*/
-/* $Id: pgsql_driver.c,v 1.53.2.1 2005/11/25 03:35:04 wez Exp $ */
+/* $Id: pgsql_driver.c,v 1.53.2.2 2005/11/29 02:11:37 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -108,6 +110,81 @@
}
/* }}} */
+/* {{{ pdo_pgsql_create_lob_stream */
+static size_t pgsql_lob_write(php_stream *stream, const char *buf, size_t
count TSRMLS_DC)
+{
+ struct pdo_pgsql_lob_self *self = (struct
pdo_pgsql_lob_self*)stream-abstract;
+ return lo_write(self-conn, self-lfd, (char*)buf, count);
+}
+
+static size_t pgsql_lob_read(php_stream *stream, char *buf, size_t count
TSRMLS_DC)
+{
+ struct pdo_pgsql_lob_self *self = (struct
pdo_pgsql_lob_self*)stream-abstract;
+ return lo_read(self-conn, self-lfd, buf, count);
+}
+
+static int pgsql_lob_close(php_stream *stream, int close_handle TSRMLS_DC)
+{
+ struct pdo_pgsql_lob_self *self = (struct
pdo_pgsql_lob_self*)stream-abstract;
+ pdo_dbh_t *dbh = self-dbh;
+
+ if (close_handle) {
+ lo_close(self-conn, self-lfd);
+ }
+ efree(self);
+ php_pdo_dbh_delref(dbh TSRMLS_DC);
+ return 0;
+}
+
+static int pgsql_lob_flush(php_stream *stream TSRMLS_DC)
+{
+ return 0;
+}
+
+static int pgsql_lob_seek(php_stream *stream, off_t offset, int whence,
+ off_t *newoffset TSRMLS_DC)
+{
+ struct pdo_pgsql_lob_self *self = (struct
pdo_pgsql_lob_self*)stream-abstract;
+ int pos = lo_lseek(self-conn, self-lfd, offset, whence);
+ *newoffset = pos;
+ return pos = 0 ? 0 : -1;
+}
+
+php_stream_ops pdo_pgsql_lob_stream_ops = {
[PHP-CVS] cvs: php-src /ext/simplexml/tests 012.phpt
helly Mon Nov 28 21:42:00 2005 EDT Modified files: /php-src/ext/simplexml/tests012.phpt Log: - Allow test to be used w/o run-tests.php http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/012.phpt?r1=1.6r2=1.7ty=u Index: php-src/ext/simplexml/tests/012.phpt diff -u php-src/ext/simplexml/tests/012.phpt:1.6 php-src/ext/simplexml/tests/012.phpt:1.7 --- php-src/ext/simplexml/tests/012.phpt:1.6Sat Oct 29 12:12:57 2005 +++ php-src/ext/simplexml/tests/012.phptMon Nov 28 21:41:54 2005 @@ -26,6 +26,7 @@ $sxe[] = error; +__HALT_COMPILER(); ? ===DONE=== --EXPECTF-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
helly Mon Nov 28 21:46:20 2005 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
- Fix some memleaks
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.177r2=1.178ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.177
php-src/ext/simplexml/simplexml.c:1.178
--- php-src/ext/simplexml/simplexml.c:1.177 Sun Nov 20 08:03:15 2005
+++ php-src/ext/simplexml/simplexml.c Mon Nov 28 21:46:19 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.177 2005/11/20 13:03:15 helly Exp $ */
+/* $Id: simplexml.c,v 1.178 2005/11/29 02:46:19 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -746,10 +746,19 @@
}
/* }}} */
+static inline char * sxe_xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr list,
int inLine)
+{
+ xmlChar *tmp = xmlNodeListGetString(doc, list, inLine);
+ char*res = estrdup((char*)tmp);
+
+ xmlFree(tmp);
+
+ return res;
+}
+
/* {{{ _get_base_node_value()
*/
-static void
-_get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr node, zval **value,
char *prefix TSRMLS_DC)
+static void _get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr node,
zval **value, char *prefix TSRMLS_DC)
{
php_sxe_object *subnode;
xmlChar*contents;
@@ -838,7 +847,7 @@
while (attr) {
if ((!test || !xmlStrcmp(attr-name, sxe-iter.name))
match_ns(sxe, (xmlNodePtr)attr, sxe-iter.nsprefix)) {
MAKE_STD_ZVAL(value);
- ZVAL_STRING(value,
xmlNodeListGetString((xmlDocPtr) sxe-document-ptr, attr-children, 1), 1);
+ ZVAL_STRING(value,
sxe_xmlNodeListGetString((xmlDocPtr) sxe-document-ptr, attr-children, 1), 0);
namelen = xmlStrlen(attr-name) + 1;
if (!zattr) {
MAKE_STD_ZVAL(zattr);
@@ -856,7 +865,7 @@
if (node sxe-iter.type != SXE_ITER_ATTRLIST) {
if (node-type == XML_ATTRIBUTE_NODE) {
MAKE_STD_ZVAL(value);
-
ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), value,
xmlNodeListGetString(node-doc, node-children, 1), 1);
+ ZVAL_STRING(value, sxe_xmlNodeListGetString(node-doc,
node-children, 1), 0);
zend_hash_next_index_insert(rv, value, sizeof(zval *),
NULL);
node = NULL;
} else {
@@ -869,7 +878,7 @@
} else {
if (node-type == XML_TEXT_NODE) {
MAKE_STD_ZVAL(value);
-
ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), value,
xmlNodeListGetString(node-doc, node, 1), 1);
+ ZVAL_STRING(value,
sxe_xmlNodeListGetString(node-doc, node, 1), 0);
zend_hash_next_index_insert(rv, value,
sizeof(zval *), NULL);
goto next_iter;
}
@@ -2020,7 +2029,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.177 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.178 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
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
helly Mon Nov 28 21:53:56 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.244r2=1.2027.2.245ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.244 php-src/NEWS:1.2027.2.245 --- php-src/NEWS:1.2027.2.244 Mon Nov 28 20:23:16 2005 +++ php-src/NEWSMon Nov 28 21:53:48 2005 @@ -1,6 +1,10 @@ PHPNEWS ||| ?? ??? 200?, PHP 5.1.2 +- Improved SimpleXML extension: (Marcus) + . Fixed memleaks + . Added methods getNamespaces(), getDocNamespaces() + . Fixed var_dump() - Fixed bug #35456 (+ 1 [time unit] format did not work). (Ilia) - Fixed bug #35431 (PDO crashes when using LAZY fetch with fetchAll). (Wez) - Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony) @@ -13,6 +17,7 @@ - Fixed bug #35393 (changing static protected members from outside the class, one more reference issue). (Dmitry) - Fixed bug #35381 (ssl library is not initialized properly). (Alan) +- Fixed bug #35028 (XML object fails FALSE test). (Marcus) 28 Nov 2005, PHP 5.1.1 - Disabled native date class to prevent pear::date conflict. (Ilia) @@ -132,7 +137,7 @@ - Added support of parameter=value arrays to xsl_xsltprocessor_set_parameter(). (Tony) -- Improved PHP extension loading mechanism with support for module +- PHP extension loading mechanism with support for module dependencies and conflicts. (Jani, Dmitry) - Improved interactive mode of PHP CLI (php -a). (Johannes, Marcus) - Improved performance of: -- 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
helly Mon Nov 28 21:58:23 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - BFN (not to forget this one) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.245r2=1.2027.2.246ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.245 php-src/NEWS:1.2027.2.246 --- php-src/NEWS:1.2027.2.245 Mon Nov 28 21:53:48 2005 +++ php-src/NEWSMon Nov 28 21:58:20 2005 @@ -5,6 +5,7 @@ . Fixed memleaks . Added methods getNamespaces(), getDocNamespaces() . Fixed var_dump() + . Fixed isset/empty/(bool) behavior - Fixed bug #35456 (+ 1 [time unit] format did not work). (Ilia) - Fixed bug #35431 (PDO crashes when using LAZY fetch with fetchAll). (Wez) - Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony) -- 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
helly Mon Nov 28 22:11:28 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - BFN (reorder + missed another one) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.246r2=1.2027.2.247ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.246 php-src/NEWS:1.2027.2.247 --- php-src/NEWS:1.2027.2.246 Mon Nov 28 21:58:20 2005 +++ php-src/NEWSMon Nov 28 22:11:26 2005 @@ -3,9 +3,10 @@ ?? ??? 200?, PHP 5.1.2 - Improved SimpleXML extension: (Marcus) . Fixed memleaks - . Added methods getNamespaces(), getDocNamespaces() . Fixed var_dump() . Fixed isset/empty/(bool) behavior + . Fixed iterator edge cases + . Added methods getNamespaces(), getDocNamespaces() - Fixed bug #35456 (+ 1 [time unit] format did not work). (Ilia) - Fixed bug #35431 (PDO crashes when using LAZY fetch with fetchAll). (Wez) - Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony) -- 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
helly Mon Nov 28 22:35:34 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.247r2=1.2027.2.248ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.247 php-src/NEWS:1.2027.2.248 --- php-src/NEWS:1.2027.2.247 Mon Nov 28 22:11:26 2005 +++ php-src/NEWSMon Nov 28 22:35:33 2005 @@ -1,6 +1,9 @@ PHPNEWS ||| ?? ??? 200?, PHP 5.1.2 +- Improved SPL: (Marcus) + . Added class SplFileInfo as root class for DirectoryIterator and +SplFileObject - Improved SimpleXML extension: (Marcus) . Fixed memleaks . Fixed var_dump() -- 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_1) /ext/spl php_spl.c spl_directory.c spl_directory.h /ext/spl/examples nocvsdir.php /ext/spl/tests iterator_028.phpt spl_autoload_004.phpt sxe_001.phpt sxe_004.phpt
Hello, the main reason for this change is that the new SplFileInfo class can be used as a return value for DirectoryIterator/RecursiveDirectoryIterator to suppress problems when put into CacheingIterator/RecursiveCachingIterator. By having the object returned one can circumvent the fact that the former are active iterators while the caching iterator requires passive ones. regards marcus Tuesday, November 29, 2005, 4:34:00 AM, you wrote: helly Mon Nov 28 22:34:00 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/splphp_spl.c spl_directory.c spl_directory.h /php-src/ext/spl/examples nocvsdir.php /php-src/ext/spl/tests iterator_028.phpt spl_autoload_004.phpt sxe_001.phpt sxe_004.phpt Log: - MFH Add class SplFileInfo as base for DirectoryIterator and SplFileObject # As discussed with ilia before 5.1.0 Best regards, Marcus -- 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) /ext/pdo_pgsql pgsql_driver.c
wez Mon Nov 28 23:06:03 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_pgsql pgsql_driver.c
Log:
proto fixups
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.53.2.2r2=1.53.2.3ty=u
Index: php-src/ext/pdo_pgsql/pgsql_driver.c
diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.2
php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.3
--- php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.2 Mon Nov 28 21:11:37 2005
+++ php-src/ext/pdo_pgsql/pgsql_driver.cMon Nov 28 23:06:03 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pgsql_driver.c,v 1.53.2.2 2005/11/29 02:11:37 wez Exp $ */
+/* $Id: pgsql_driver.c,v 1.53.2.3 2005/11/29 04:06:03 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -474,9 +474,9 @@
return pdo_pgsql_transaction_cmd(ROLLBACK, dbh TSRMLS_CC);
}
-/* {{{ string pgSQL::pgsqlLOBCreate()
+/* {{{ proto string PDO::pgsqlLOBCreate()
Creates a new large object, returning its identifier. Must be called
inside a transaction. */
-static PHP_METHOD(pgSQL, pgsqlLOBCreate)
+static PHP_METHOD(PDO, pgsqlLOBCreate)
{
pdo_dbh_t *dbh;
pdo_pgsql_db_handle *H;
@@ -499,9 +499,9 @@
}
/* }}} */
-/* {{{ resource pgSQL::pgsqlLOBOpen(string oid [, string mode = 'rb'])
+/* {{{ proto resource PDO::pgsqlLOBOpen(string oid [, string mode = 'rb'])
Opens an existing large object stream. Must be called inside a
transaction. */
-static PHP_METHOD(pgSQL, pgsqlLOBOpen)
+static PHP_METHOD(PDO, pgsqlLOBOpen)
{
pdo_dbh_t *dbh;
pdo_pgsql_db_handle *H;
@@ -548,16 +548,23 @@
}
/* }}} */
-/* {{{ bool pgSQL::pgsqlLOBUnlink(int oid)
+/* {{{ proto bool PDO::pgsqlLOBUnlink(string oid)
Deletes the large object identified by oid. Must be called inside a
transaction. */
-static PHP_METHOD(pgSQL, pgsqlLOBUnlink)
+static PHP_METHOD(PDO, pgsqlLOBUnlink)
{
pdo_dbh_t *dbh;
pdo_pgsql_db_handle *H;
- long lfd;
+ Oid oid;
+ char *oidstr, *end_ptr;
+ int oidlen;
+
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s,
+ oidstr, oidlen)) {
+ RETURN_FALSE;
+ }
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l,
- lfd)) {
+ oid = (Oid)strtoul(oidstr, end_ptr, 10);
+ if (oid == 0 (errno == ERANGE || errno == EINVAL)) {
RETURN_FALSE;
}
@@ -566,19 +573,19 @@
H = (pdo_pgsql_db_handle *)dbh-driver_data;
- if (1 == lo_unlink(H-server, lfd)) {
+ if (1 == lo_unlink(H-server, oid)) {
RETURN_TRUE;
}
pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, HY000);
RETURN_FALSE;
}
-
+/* }}} */
static function_entry dbh_methods[] = {
- PHP_ME(pgSQL, pgsqlLOBCreate, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(pgSQL, pgsqlLOBOpen, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(pgSQL, pgsqlLOBUnlink, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(PDO, pgsqlLOBCreate, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(PDO, pgsqlLOBOpen, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(PDO, pgsqlLOBUnlink, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
--
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_1) /ext/spl php_spl.c spl_directory.c spl_directory.h /ext/spl/examples nocvsdir.php /ext/spl/tests iterator_028.phpt spl_autoload_004.phpt sxe_001.phpt sxe_004.phpt
eyes glazing over coma -Andrei On Nov 28, 2005, at 7:37 PM, Marcus Boerger wrote: Hello, the main reason for this change is that the new SplFileInfo class can be used as a return value for DirectoryIterator/ RecursiveDirectoryIterator to suppress problems when put into CacheingIterator/ RecursiveCachingIterator. By having the object returned one can circumvent the fact that the former are active iterators while the caching iterator requires passive ones. regards marcus Tuesday, November 29, 2005, 4:34:00 AM, you wrote: helly Mon Nov 28 22:34:00 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/splphp_spl.c spl_directory.c spl_directory.h /php-src/ext/spl/examples nocvsdir.php /php-src/ext/spl/tests iterator_028.phpt spl_autoload_004.phpt sxe_001.phpt sxe_004.phpt Log: - MFH Add class SplFileInfo as base for DirectoryIterator and SplFileObject # As discussed with ilia before 5.1.0 Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
