[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Apr 11 05:31:48 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2311r2=1.2312diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2311 php-src/ChangeLog:1.2312 --- php-src/ChangeLog:1.2311Mon Apr 10 05:31:46 2006 +++ php-src/ChangeLog Tue Apr 11 05:31:47 2006 @@ -1,3 +1,140 @@ +2006-04-10 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/standard/tests/file/bug24313.phpt: + MFB51: fixed test + +* (PHP_5_1) + ext/standard/tests/file/bug24313.phpt: + Fixed test + +2006-04-10 Marcus Boerger [EMAIL PROTECTED] + +* ext/simplexml/simplexml.c + ext/simplexml/simplexml.c: + - Coverity issue 59 + +* (PHP_5_1) + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h: + - MFH Iterators from overloaded objects are allowed to not have keys... + +* ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h: + - Iterators from overloaded objects are allowed to not have keys... + +* ZendEngine2/zend_interfaces.c: + - Allowing to pass in ce as NULL has its charme, too + +* ZendEngine2/zend_interfaces.c: + - Fix coverity issue 49: ce might be forwarded as NULL without an exception +being thrown in case the Zend API is being used wrong (in custom exts + for +instance). + +* ext/pgsql/pgsql.c: + - Better order for SEGV prevention + +* ext/pgsql/pgsql.c: + - Fix possible SEGV + +* ext/exif/exif.c: + - Fix condition + +2006-04-10 Jani Taskinen [EMAIL PROTECTED] + +* INSTALL + php.ini-dist + php.ini-recommended + ext/mbstring/tests/skipif.inc + ext/standard/tests/array/bug33940.phpt + main/php_variables.c + tests/basic/012.phpt: + more cleanup (lingering ini settings which do not exist anymore, etc.) + +* ext/session/php_session.h + ext/session/session.c + ext/session/tests/007.phpt + ext/session/tests/008-php4.2.3.phpt + ext/session/tests/008.phpt + ext/session/tests/009.phpt + ext/session/tests/010.phpt + ext/session/tests/011.phpt + ext/session/tests/012.phpt + ext/session/tests/013.phpt + ext/session/tests/014.phpt + ext/session/tests/019.phpt + ext/session/tests/skipif.inc: + - Cleanup + +* ext/iconv/tests/bug16069.phpt + ext/iconv/tests/eucjp2iso2022jp.phpt + ext/iconv/tests/eucjp2sjis.phpt + ext/iconv/tests/eucjp2utf8.phpt + ext/iconv/tests/iconv001.phpt + ext/iconv/tests/iconv002.phpt + ext/iconv/tests/ob_iconv_handler.phpt + ext/iconv/tests/test.inc + ext/iconv/tests/translit-failure.phpt + ext/iconv/tests/translit-utf8.phpt: + cleanup + +2006-04-10 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + Fixed bug #36908 (wsdl default value overrides value in soap request). + +* ZendEngine2/zend_opcode.c + ZendEngine2/zend_opcode.c: + Fixed possible crash in interactive mode + +2006-04-10 Jani Taskinen [EMAIL PROTECTED] + +* acinclude.m4: + fix typo + +* (PHP_5_1) + acinclude.m4 + configure.in + scripts/phpize.m4: + MFH: - Determine the shared/link lib suffixes in one macro. + +* acinclude.m4 + configure.in + scripts/phpize.m4: + - Determine the shared/link lib suffixes in one macro. + +* (PHP_5_1) + TSRM/tsrm_virtual_cwd.h + ext/standard/filestat.c: + MFH: - Fixed bug #36909 (ld: Undefined symbols: _lchown) + +* TSRM/tsrm_virtual_cwd.h + ext/standard/filestat.c: + - Fixed bug #36909 (ld: Undefined symbols: _lchown) + +* (PHP_5_1) + main/php_compat.h: + MFH: - Silence some PCRE compile warnings + +* main/php_compat.h: + - Silence some PCRE compile warnings + +* NEWS: + - Fix NEWS. The empty lines were left on purpose.. + +* (PHP_5_1) + ext/standard/credits_ext.h: + update credits + +* ext/standard/credits_ext.h + ext/standard/credits_sapi.h: + fix credits + +* (PHP_5_1) + NEWS: + Fix NEWS + 2006-04-09 Andrei Zmievski [EMAIL PROTECTED] * (PHP_5_1)
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Apr 11 05:31:54 2006 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/ZendEngine2/ChangeLog?r1=1.895r2=1.896diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.895 ZendEngine2/ChangeLog:1.896 --- ZendEngine2/ChangeLog:1.895 Sat Apr 8 05:31:55 2006 +++ ZendEngine2/ChangeLog Tue Apr 11 05:31:53 2006 @@ -1,3 +1,29 @@ +2006-04-10 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + zend_vm_def.h + zend_vm_execute.h: + - MFH Iterators from overloaded objects are allowed to not have keys... + +* zend_vm_def.h + zend_vm_execute.h: + - Iterators from overloaded objects are allowed to not have keys... + +* zend_interfaces.c: + - Allowing to pass in ce as NULL has its charme, too + +* zend_interfaces.c: + - Fix coverity issue 49: ce might be forwarded as NULL without an exception +being thrown in case the Zend API is being used wrong (in custom exts + for +instance). + +2006-04-10 Dmitry Stogov [EMAIL PROTECTED] + +* zend_opcode.c + zend_opcode.c: + Fixed possible crash in interactive mode + 2006-04-07 Dmitry Stogov [EMAIL PROTECTED] * (PHP_5_1) @@ -13085,7 +13111,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.895 2006/04/08 05:31:55 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.896 2006/04/11 05:31:53 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -14809,7 +14835,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.895 2006/04/08 05:31:55 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.896 2006/04/11 05:31:53 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
sniper Mon Apr 10 09:41:45 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Fix NEWS http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.501r2=1.2027.2.502diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.501 php-src/NEWS:1.2027.2.502 --- php-src/NEWS:1.2027.2.501 Sun Apr 9 23:35:51 2006 +++ php-src/NEWSMon Apr 10 09:41:45 2006 @@ -1,22 +1,22 @@ PHPNEWS ||| 06 Apr 2006, PHP 5.1.3RC3 -- Sped up SoapClient/SoapServer construction by making SOAP extension cache - WSDL structure in memory. (Andrei) +- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry) +- Changed SOAP extension to cache WSDL structure in memory and thus speed up + SoapClient/SoapServer construction. (Andrei) +- Removed the E_STRICT deprecation notice from var. (Ilia) +- Added overflow checks to wordwrap() function. (Ilia) +- Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8 + (also fixes bug #36764). (Tony) +- Fixed tempnam() 2nd parameter to be checked against path components. (Ilia) - Fixed a bug that would not fill in the fifth argument to preg_replace() properly, if the variable was not declared previously. (Andrei) - Fixed safe_mode check for source argument of the copy() function. (Ilia) - Fixed mysqli bigint conversion under Windows (Georg) - Fixed XSS inside phpinfo() with long inputs. (Ilia) -- Check 2nd parameter of tempnam() against path components. (Ilia) - Fixed Apache2 SAPIs header handler modifying header strings. (Mike) -- Allowed 'auto_globals_jit' work together with 'register_argc_argv'. (Dmitry) -- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry) +- Fixed 'auto_globals_jit' to work together with 'register_argc_argv'. (Dmitry) - Fixed offset/length parameter validation in substr_compare() function. (Ilia) -- Added overflow checks to wordwrap() function. (Ilia) -- Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8 - (also fixes bug #36764). (Tony) -- Removed the E_STRICT deprecation notice from var. (Ilia) - Fixed debug_zval_dump() to support private and protected members. (Dmitry) - Fixed SoapFault::getMessage(). (Dmitry) - Fixed bug #36981 (SplFileObject-fgets() ignores max_length). (Tony) @@ -70,7 +70,7 @@ (Dmitry) 09 Mar 2006, PHP 5.1.3RC1 -- Updated PCRE to version 6.6. (Andrei) +- Updated bundled PCRE libary to version 6.6. (Andrei) - Moved extensions to PECL: . ext/msession (Derick) - Reimplemented FastCGI interface. (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard credits_ext.h credits_sapi.h
sniper Mon Apr 10 09:46:32 2006 UTC Modified files: /php-src/ext/standard credits_ext.h credits_sapi.h Log: fix credits http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/credits_ext.h?r1=1.35r2=1.36diff_format=u Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.35 php-src/ext/standard/credits_ext.h:1.36 --- php-src/ext/standard/credits_ext.h:1.35 Thu Mar 23 18:39:12 2006 +++ php-src/ext/standard/credits_ext.h Mon Apr 10 09:46:31 2006 @@ -48,7 +48,6 @@ CREDIT_LINE(mySQL driver for PDO, George Schlossnagle, Wez Furlong, Ilia Alshanetsky); CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); CREDIT_LINE(MySQLi, Zak Greant, Georg Richter); -CREDIT_LINE(ncurses, Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe, Georg Richter); CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong); CREDIT_LINE(ODBC driver for PDO, Wez Furlong); CREDIT_LINE(ODBC, Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky); http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/credits_sapi.h?r1=1.18r2=1.19diff_format=u Index: php-src/ext/standard/credits_sapi.h diff -u php-src/ext/standard/credits_sapi.h:1.18 php-src/ext/standard/credits_sapi.h:1.19 --- php-src/ext/standard/credits_sapi.h:1.18Thu Aug 11 20:45:25 2005 +++ php-src/ext/standard/credits_sapi.h Mon Apr 10 09:46:32 2006 @@ -16,7 +16,7 @@ CREDIT_LINE(Apache 2.0 Filter, Sascha Schumann, Aaron Bannert); CREDIT_LINE(Apache 2.0 Handler, Ian Holsman, Justin Erenkrantz (based on Apache 2.0 Filter code)); CREDIT_LINE(Caudium / Roxen, David Hedbor); -CREDIT_LINE(CGI / FastCGI, Rasmus Lerdorf, Stig Bakken, Shane Caraveo); +CREDIT_LINE(CGI / FastCGI, Rasmus Lerdorf, Stig Bakken, Shane Caraveo, Dmitry Stogov); CREDIT_LINE(CLI, Edin Kadribasic, Marcus Boerger, Johannes Schlueter); CREDIT_LINE(Continuity, Alex Leigh (based on nsapi code)); CREDIT_LINE(Embed, Edin Kadribasic); -- 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 credits_ext.h
sniper Mon Apr 10 09:49:18 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/standard credits_ext.h Log: update credits http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/credits_ext.h?r1=1.30.2.5r2=1.30.2.6diff_format=u Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.30.2.5 php-src/ext/standard/credits_ext.h:1.30.2.6 --- php-src/ext/standard/credits_ext.h:1.30.2.5 Thu Mar 23 18:36:46 2006 +++ php-src/ext/standard/credits_ext.h Mon Apr 10 09:49:18 2006 @@ -58,7 +58,7 @@ CREDIT_LINE(Perl Compatible Regexps, Andrei Zmievski); CREDIT_LINE(PHP Data Objects, Wez Furlong, Marcus Boerger, Sterling Hughes, George Schlossnagle, Ilia Alshanetsky); CREDIT_LINE(PHP hash, Sara Golemon, Rasmus Lerdorf, Stefan Esser, Michael Wallner); -CREDIT_LINE(Posix, Kristian Köhntopp); +CREDIT_LINE(Posix, Kristian Koehntopp); CREDIT_LINE(PostgreSQL driver for PDO, Edin Kadribasic, Ilia Alshanetsky); CREDIT_LINE(PostgreSQL, Jouni Ahto, Zeev Suraski, Yasuo Ohgaki, Chris Kings-Lynne); CREDIT_LINE(Pspell, Vlad Krupin); -- 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/soap php_sdl.c
dmitry Mon Apr 10 10:11:06 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/soap php_sdl.c
Log:
ZTS fix
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.7r2=1.88.2.8diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.7 php-src/ext/soap/php_sdl.c:1.88.2.8
--- php-src/ext/soap/php_sdl.c:1.88.2.7 Sun Apr 9 23:35:51 2006
+++ php-src/ext/soap/php_sdl.c Mon Apr 10 10:11:06 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.7 2006/04/09 23:35:51 andrei Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.8 2006/04/10 10:11:06 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -3156,7 +3156,7 @@
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Failed to register persistent entry);
/* clean up persistent sdl */
- delete_psdl(le_ptr);
+ delete_psdl(le_ptr TSRMLS_CC);
/* keep non-persistent sdl and return it */
}
}
--
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 Apr 10 10:11:29 2006 UTC
Modified files:
/php-src/ext/soap php_sdl.c
Log:
ZTS fix
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.95r2=1.96diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.95 php-src/ext/soap/php_sdl.c:1.96
--- php-src/ext/soap/php_sdl.c:1.95 Sun Apr 9 23:38:30 2006
+++ php-src/ext/soap/php_sdl.c Mon Apr 10 10:11:29 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.95 2006/04/09 23:38:30 andrei Exp $ */
+/* $Id: php_sdl.c,v 1.96 2006/04/10 10:11:29 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -3156,7 +3156,7 @@
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Failed to register persistent entry);
/* clean up persistent sdl */
- delete_psdl(le_ptr);
+ delete_psdl(le_ptr TSRMLS_CC);
/* keep non-persistent sdl and return it */
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Mon Apr 10 10:16:42 2006 UTC Modified files: /php-srcNEWS Log: - Fix NEWS. The empty lines were left on purpose.. http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2112r2=1.2113diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2112 php-src/NEWS:1.2113 --- php-src/NEWS:1.2112 Mon Apr 3 17:46:12 2006 +++ php-src/NEWSMon Apr 10 10:16:42 2006 @@ -1,39 +1,44 @@ PHPNEWS ||| -?? ??? , PHP 6.0 +?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) -- Disabled dl(). Now it is enabled only when a SAPI layer registers it - explicitly. Only CLI, CGI and EMBED do this. (Dmitry). -- Return new by reference now throws an E_STRICT error. (Dmitry) -- Added E_STRICT to E_ALL. (Dmitry) -- Dropped safe_mode support (Ilia, Andi) -- Dropped zend.ze1_compatibility_mode (Dmitry) -- Dropped allow_call_time_pass_reference, added E_STRICT error message. (Dmitry) -- Dropped register_long_arrays (Dmitry) -- Dropped register_globals support (Pierre) - - session_register, session_unregister and session_is_registered removed they -depend on register_globals -- Dropped magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase ini - settings (Pierre) - - get_magic_quotes_gpc, get_magic_quotes_runtime are kept but always return - false, set_magic_quotes_runtime raises an E_CORE_ERROR -- Freetype 1.x and GD 1.x support removed (Pierre) -- Cleaned CGI code. Now FastCGI can not be disabled. See sapi/cgi/CHANGES - for more details. (Dmitry) -- Removed support for continue and break operators with non-constant - operands. (Dmitry) -- Implemented jump label operator (limited goto). (Dmitry, Sara) + +- Changed dl() to be disabled by default. Enabled only when explicitly + registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) +- Changed return new by reference to throw an E_STRICT error. (Dmitry) - Changed __toString() behavior to call it in all necessary places (Marcus, Dmitry) - Changed instanceof and catch operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) + +- Removed old legacy: + . register_globals support. (Pierre) + . register_long_arrays ini option. (Dmitry) + . safe_mode support. (Ilia, Andi) + . zend.ze1_compatibility_mode ini option. (Dmitry) + . allow_call_time_pass_reference, added E_STRICT error message. (Dmitry) + . session_register(), session_unregister() and session_is_registered() +(needed only with register_globals=On). + . magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase ini +options. (Pierre) + . Changed get_magic_quotes_gpc(), get_magic_quotes_runtime to always return +false and set_magic_quotes_runtime() to raise an E_CORE_ERROR. +- Removed support for continue and break operators with non-constant + operands. (Dmitry) +- Removed Freetype 1.x and GD 1.x from GD extension. (Pierre) - Removed global reflection constants. (Johannes) + +- Improved and cleaned CGI code. FastCGI is now always enabled and can not be + disabled. See sapi/cgi/CHANGES for more details. (Dmitry) +- Improved cURL: (Ilia) + . Added curl_setopt_array() which allows setting of multiple cURL options. + . Added CURLINFO_HEADER_OUT constant to facilitate request retrieval. + +- Added jump label operator (limited goto). (Dmitry, Sara) +- Added E_STRICT to E_ALL. (Dmitry) - Added gmp_nextprime() function. (Tony, patch by ants dot aasma at gmail dot com) -- Added allow_url_include ini directive to be able to turn off remote url +- Added allow_url_include ini option to be able to turn off remote url code execution separately from the allow_url_fopen setting. (Rasmus) -- Added to cURL extension: (Ilia) - . curl_setopt_array() which allows setting of multiple cURL options. - . CURLINFO_HEADER_OUT constant to facilitate request retrieval. - Added --rclass and --rextension CLI parameters to reflect internal classes and loaded extensions. (Johannes) - Added optional parameter to http_build_query() to allow specification of @@ -46,5 +51,6 @@ defined using reflection API. (Johannes) - Added second optional parameter to stream_context_create() to set params during context creation. (Sara) + - Fixed bug #36630 (umask not reset at the end of the request). (Ilia) - Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_compat.h
sniper Mon Apr 10 11:54:54 2006 UTC Modified files: /php-src/main php_compat.h Log: - Silence some PCRE compile warnings http://cvs.php.net/viewcvs.cgi/php-src/main/php_compat.h?r1=1.27r2=1.28diff_format=u Index: php-src/main/php_compat.h diff -u php-src/main/php_compat.h:1.27 php-src/main/php_compat.h:1.28 --- php-src/main/php_compat.h:1.27 Wed Feb 1 13:10:04 2006 +++ php-src/main/php_compat.h Mon Apr 10 11:54:54 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_compat.h,v 1.27 2006/02/01 13:10:04 jorton Exp $ */ +/* $Id: php_compat.h,v 1.28 2006/04/10 11:54:54 sniper Exp $ */ #ifndef PHP_COMPAT_H #define PHP_COMPAT_H @@ -38,6 +38,8 @@ #define pcre_study php_pcre_study #define pcre_version php_pcre_version #define pcre_fullinfo php_pcre_fullinfo +#define pcre_free php_pcre_free +#define pcre_mallocphp_pcre_malloc #endif #define lookup php_lookup -- 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_compat.h
sniper Mon Apr 10 11:55:14 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/main php_compat.h Log: MFH: - Silence some PCRE compile warnings http://cvs.php.net/viewcvs.cgi/php-src/main/php_compat.h?r1=1.25.2.2r2=1.25.2.3diff_format=u Index: php-src/main/php_compat.h diff -u php-src/main/php_compat.h:1.25.2.2 php-src/main/php_compat.h:1.25.2.3 --- php-src/main/php_compat.h:1.25.2.2 Wed Feb 1 13:52:46 2006 +++ php-src/main/php_compat.h Mon Apr 10 11:55:14 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_compat.h,v 1.25.2.2 2006/02/01 13:52:46 jorton Exp $ */ +/* $Id: php_compat.h,v 1.25.2.3 2006/04/10 11:55:14 sniper Exp $ */ #ifndef PHP_COMPAT_H #define PHP_COMPAT_H @@ -38,6 +38,8 @@ #define pcre_study php_pcre_study #define pcre_version php_pcre_version #define pcre_fullinfo php_pcre_fullinfo +#define pcre_free php_pcre_free +#define pcre_mallocphp_pcre_malloc #endif #define lookup php_lookup -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard filestat.c TSRM tsrm_virtual_cwd.h
sniper Mon Apr 10 11:56:04 2006 UTC
Modified files:
/TSRM tsrm_virtual_cwd.h
/php-src/ext/standard filestat.c
Log:
- Fixed bug #36909 (ld: Undefined symbols: _lchown)
http://cvs.php.net/viewcvs.cgi/TSRM/tsrm_virtual_cwd.h?r1=1.52r2=1.53diff_format=u
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.52 TSRM/tsrm_virtual_cwd.h:1.53
--- TSRM/tsrm_virtual_cwd.h:1.52Wed Feb 8 20:49:40 2006
+++ TSRM/tsrm_virtual_cwd.h Mon Apr 10 11:56:04 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.52 2006/02/08 20:49:40 tony2001 Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.53 2006/04/10 11:56:04 sniper Exp $ */
#ifndef VIRTUAL_CWD_H
#define VIRTUAL_CWD_H
@@ -243,8 +243,10 @@
#define VCWD_CHMOD(path, mode) virtual_chmod(path, mode TSRMLS_CC)
#if !defined(TSRM_WIN32) !defined(NETWARE)
#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group, 0
TSRMLS_CC)
+#if HAVE_LCHOWN
#define VCWD_LCHOWN(path, owner, group) virtual_chown(path, owner, group, 1
TSRMLS_CC)
#endif
+#endif
#else
@@ -286,8 +288,10 @@
#define VCWD_CHMOD(path, mode) chmod(path, mode)
#if !defined(TSRM_WIN32) !defined(NETWARE)
#define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
+#if HAVE_LCHOWN
#define VCWD_LCHOWN(path, owner, group) lchown(path, owner, group)
#endif
+#endif
#endif
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/filestat.c?r1=1.145r2=1.146diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.145
php-src/ext/standard/filestat.c:1.146
--- php-src/ext/standard/filestat.c:1.145 Sun Apr 9 17:58:02 2006
+++ php-src/ext/standard/filestat.c Mon Apr 10 11:56:04 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.145 2006/04/09 17:58:02 iliaa Exp $ */
+/* $Id: filestat.c,v 1.146 2006/04/10 11:56:04 sniper Exp $ */
#include php.h
#include fopen_wrappers.h
@@ -353,7 +353,9 @@
}
if (do_lchgrp) {
+#if HAVE_LCHOWN
ret = VCWD_LCHOWN(Z_STRVAL_PP(filename), -1, gid);
+#endif
} else {
ret = VCWD_CHOWN(Z_STRVAL_PP(filename), -1, gid);
}
@@ -423,7 +425,9 @@
}
if (do_lchown) {
+#if HAVE_LCHOWN
ret = VCWD_LCHOWN(Z_STRVAL_PP(filename), uid, -1);
+#endif
} else {
ret = VCWD_CHOWN(Z_STRVAL_PP(filename), uid, -1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard filestat.c TSRM tsrm_virtual_cwd.h
sniper Mon Apr 10 11:56:18 2006 UTC
Modified files: (Branch: PHP_5_1)
/TSRM tsrm_virtual_cwd.h
/php-src/ext/standard filestat.c
Log:
MFH: - Fixed bug #36909 (ld: Undefined symbols: _lchown)
http://cvs.php.net/viewcvs.cgi/TSRM/tsrm_virtual_cwd.h?r1=1.48.2.4r2=1.48.2.5diff_format=u
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.48.2.4 TSRM/tsrm_virtual_cwd.h:1.48.2.5
--- TSRM/tsrm_virtual_cwd.h:1.48.2.4Sun Mar 5 18:57:54 2006
+++ TSRM/tsrm_virtual_cwd.h Mon Apr 10 11:56:18 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.48.2.4 2006/03/05 18:57:54 derick Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.48.2.5 2006/04/10 11:56:18 sniper Exp $ */
#ifndef VIRTUAL_CWD_H
#define VIRTUAL_CWD_H
@@ -243,8 +243,10 @@
#define VCWD_CHMOD(path, mode) virtual_chmod(path, mode TSRMLS_CC)
#if !defined(TSRM_WIN32) !defined(NETWARE)
#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group, 0
TSRMLS_CC)
+#if HAVE_LCHOWN
#define VCWD_LCHOWN(path, owner, group) virtual_chown(path, owner, group, 1
TSRMLS_CC)
#endif
+#endif
#else
@@ -286,8 +288,10 @@
#define VCWD_CHMOD(path, mode) chmod(path, mode)
#if !defined(TSRM_WIN32) !defined(NETWARE)
#define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
+#if HAVE_LCHOWN
#define VCWD_LCHOWN(path, owner, group) lchown(path, owner, group)
#endif
+#endif
#endif
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.6r2=1.136.2.7diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.6
php-src/ext/standard/filestat.c:1.136.2.7
--- php-src/ext/standard/filestat.c:1.136.2.6 Sun Apr 9 17:57:27 2006
+++ php-src/ext/standard/filestat.c Mon Apr 10 11:56:18 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.136.2.6 2006/04/09 17:57:27 iliaa Exp $ */
+/* $Id: filestat.c,v 1.136.2.7 2006/04/10 11:56:18 sniper Exp $ */
#include php.h
#include safe_mode.h
@@ -358,7 +358,9 @@
}
if (do_lchgrp) {
+#if HAVE_LCHOWN
ret = VCWD_LCHOWN(Z_STRVAL_PP(filename), -1, gid);
+#endif
} else {
ret = VCWD_CHOWN(Z_STRVAL_PP(filename), -1, gid);
}
@@ -432,7 +434,9 @@
}
if (do_lchown) {
+#if HAVE_LCHOWN
ret = VCWD_LCHOWN(Z_STRVAL_PP(filename), uid, -1);
+#endif
} else {
ret = VCWD_CHOWN(Z_STRVAL_PP(filename), uid, -1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /scripts phpize.m4
sniper Mon Apr 10 12:16:08 2006 UTC Modified files: /php-srcacinclude.m4 configure.in /php-src/scriptsphpize.m4 Log: - Determine the shared/link lib suffixes in one macro. http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.343r2=1.344diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.343 php-src/acinclude.m4:1.344 --- php-src/acinclude.m4:1.343 Sat Apr 8 17:34:57 2006 +++ php-src/acinclude.m4Mon Apr 10 12:16:08 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.343 2006/04/08 17:34:57 andrei Exp $ +dnl $Id: acinclude.m4,v 1.344 2006/04/10 12:16:08 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -1877,40 +1877,27 @@ dnl - dnl -dnl PHP_SHLIB_BUILD_SUFFIX_NAME -dnl -dnl Determines link library suffix -dnl suffix can be: .so, .sl or .dylib -dnl -AC_DEFUN([PHP_SHLIB_BUILD_SUFFIX_NAME],[ - AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl - PHP_SUBST(SHLIB_SUFFIX_NAME) - SHLIB_SUFFIX_NAME=so - case $host_alias in - *hpux*[)] - SHLIB_SUFFIX_NAME=sl - ;; - *darwin*[)] - SHLIB_SUFFIX_NAME=dylib - ;; - esac -]) - -dnl dnl PHP_SHLIB_SUFFIX_NAME dnl -dnl Determines shared library suffix +dnl Determines link library suffix SHLIB_SUFFIX_NAME +dnl which can be: .so, .sl or .dylib +dnl +dnl Determines shared library suffix SHLIB_DL_SUFFIX_NAME dnl suffix can be: .so or .sl dnl AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[ AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl - PHP_SUBST(SHLIB_DL_SUFFIX_NAME) + PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) + PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME) + SHLIB_SUFFIX_NAME=so SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME case $host_alias in *hpux*[)] + SHLIB_SUFFIX_NAME=sl SHLIB_DL_SUFFIX_NAME=sl ;; *darwin*[)] + SHLIB_SUFFIX_NAME=dylib SHLIB_DL_SUFFIX_NAME=so ;; esac http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.602r2=1.603diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.602 php-src/configure.in:1.603 --- php-src/configure.in:1.602 Sat Apr 8 17:34:57 2006 +++ php-src/configure.inMon Apr 10 12:16:08 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.602 2006/04/08 17:34:57 andrei Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.603 2006/04/10 12:16:08 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -224,8 +224,7 @@ PTHREADS_CHECK PHP_HELP_SEPARATOR([SAPI modules:]) -PHP_SHLIB_SUFFIX_NAME -PHP_SHLIB_BUILD_SUFFIX_NAME +PHP_SHLIB_SUFFIX_NAMES PHP_SAPI=default PHP_BUILD_PROGRAM @@ -1148,8 +1147,6 @@ PHP_SUBST(WARNING_LEVEL) PHP_SUBST(PHP_FRAMEWORKS) PHP_SUBST(PHP_FRAMEWORKPATH) -PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) -PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME) PHP_SUBST(INSTALL_HEADERS) old_CC=$CC http://cvs.php.net/viewcvs.cgi/php-src/scripts/phpize.m4?r1=1.19r2=1.20diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.19 php-src/scripts/phpize.m4:1.20 --- php-src/scripts/phpize.m4:1.19 Sat Apr 8 17:34:57 2006 +++ php-src/scripts/phpize.m4 Mon Apr 10 12:16:08 2006 @@ -59,8 +59,7 @@ [PHP_LIBDIR=$withval], [PHP_LIBDIR=lib]) PHP_RUNPATH_SWITCH -PHP_SHLIB_SUFFIX_NAME -PHP_SHLIB_BUILD_SUFFIX_NAME +PHP_SHLIB_SUFFIX_NAMES PHP_WITH_PHP_CONFIG PHP_BUILD_SHARED -- 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) / acinclude.m4 configure.in /scripts phpize.m4
sniper Mon Apr 10 12:16:17 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcacinclude.m4 configure.in /php-src/scriptsphpize.m4 Log: MFH: - Determine the shared/link lib suffixes in one macro. http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.332.2.12r2=1.332.2.13diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.12 php-src/acinclude.m4:1.332.2.13 --- php-src/acinclude.m4:1.332.2.12 Sat Apr 8 17:53:11 2006 +++ php-src/acinclude.m4Mon Apr 10 12:16:17 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.12 2006/04/08 17:53:11 andrei Exp $ +dnl $Id: acinclude.m4,v 1.332.2.13 2006/04/10 12:16:17 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -1877,40 +1877,27 @@ dnl - dnl -dnl PHP_SHLIB_BUILD_SUFFIX_NAME -dnl -dnl Determines link library suffix -dnl suffix can be: .so, .sl or .dylib -dnl -AC_DEFUN([PHP_SHLIB_BUILD_SUFFIX_NAME],[ - AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl - PHP_SUBST(SHLIB_SUFFIX_NAME) - SHLIB_SUFFIX_NAME=so - case $host_alias in - *hpux*[)] - SHLIB_SUFFIX_NAME=sl - ;; - *darwin*[)] - SHLIB_SUFFIX_NAME=dylib - ;; - esac -]) - -dnl dnl PHP_SHLIB_SUFFIX_NAME dnl -dnl Determines shared library suffix +dnl Determines link library suffix SHLIB_SUFFIX_NAME +dnl which can be: .so, .sl or .dylib +dnl +dnl Determines shared library suffix SHLIB_DL_SUFFIX_NAME dnl suffix can be: .so or .sl dnl AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[ AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl - PHP_SUBST(SHLIB_DL_SUFFIX_NAME) + PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) + PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME) + SHLIB_SUFFIX_NAME=so SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME case $host_alias in *hpux*[)] + SHLIB_SUFFIX_NAME=sl SHLIB_DL_SUFFIX_NAME=sl ;; *darwin*[)] + SHLIB_SUFFIX_NAME=dylib SHLIB_DL_SUFFIX_NAME=so ;; esac http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.579.2.44r2=1.579.2.45diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.44 php-src/configure.in:1.579.2.45 --- php-src/configure.in:1.579.2.44 Sat Apr 8 17:53:11 2006 +++ php-src/configure.inMon Apr 10 12:16:17 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.44 2006/04/08 17:53:11 andrei Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.45 2006/04/10 12:16:17 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -224,8 +224,7 @@ PTHREADS_CHECK PHP_HELP_SEPARATOR([SAPI modules:]) -PHP_SHLIB_SUFFIX_NAME -PHP_SHLIB_BUILD_SUFFIX_NAME +PHP_SHLIB_SUFFIX_NAMES PHP_SAPI=default PHP_BUILD_PROGRAM @@ -1198,8 +1197,6 @@ PHP_SUBST(WARNING_LEVEL) PHP_SUBST(PHP_FRAMEWORKS) PHP_SUBST(PHP_FRAMEWORKPATH) -PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) -PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME) PHP_SUBST(INSTALL_HEADERS) old_CC=$CC http://cvs.php.net/viewcvs.cgi/php-src/scripts/phpize.m4?r1=1.17.2.2r2=1.17.2.3diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.2 php-src/scripts/phpize.m4:1.17.2.3 --- php-src/scripts/phpize.m4:1.17.2.2 Sat Apr 8 17:53:11 2006 +++ php-src/scripts/phpize.m4 Mon Apr 10 12:16:17 2006 @@ -59,8 +59,7 @@ [PHP_LIBDIR=$withval], [PHP_LIBDIR=lib]) PHP_RUNPATH_SWITCH -PHP_SHLIB_SUFFIX_NAME -PHP_SHLIB_BUILD_SUFFIX_NAME +PHP_SHLIB_SUFFIX_NAMES PHP_WITH_PHP_CONFIG PHP_BUILD_SHARED -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
sniper Mon Apr 10 12:17:29 2006 UTC Modified files: /php-srcacinclude.m4 Log: fix typo http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.344r2=1.345diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.344 php-src/acinclude.m4:1.345 --- php-src/acinclude.m4:1.344 Mon Apr 10 12:16:08 2006 +++ php-src/acinclude.m4Mon Apr 10 12:17:29 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.344 2006/04/10 12:16:08 sniper Exp $ +dnl $Id: acinclude.m4,v 1.345 2006/04/10 12:17:29 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -1877,7 +1877,7 @@ dnl - dnl -dnl PHP_SHLIB_SUFFIX_NAME +dnl PHP_SHLIB_SUFFIX_NAMES dnl dnl Determines link library suffix SHLIB_SUFFIX_NAME dnl which can be: .so, .sl or .dylib @@ -1885,7 +1885,7 @@ dnl Determines shared library suffix SHLIB_DL_SUFFIX_NAME dnl suffix can be: .so or .sl dnl -AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[ +AC_DEFUN([PHP_SHLIB_SUFFIX_NAMES],[ AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME) -- 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) / acinclude.m4
sniper Mon Apr 10 12:17:36 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcacinclude.m4 Log: MFH: fix typo http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.332.2.13r2=1.332.2.14diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.13 php-src/acinclude.m4:1.332.2.14 --- php-src/acinclude.m4:1.332.2.13 Mon Apr 10 12:16:17 2006 +++ php-src/acinclude.m4Mon Apr 10 12:17:36 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.13 2006/04/10 12:16:17 sniper Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14 2006/04/10 12:17:36 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -1877,7 +1877,7 @@ dnl - dnl -dnl PHP_SHLIB_SUFFIX_NAME +dnl PHP_SHLIB_SUFFIX_NAMES dnl dnl Determines link library suffix SHLIB_SUFFIX_NAME dnl which can be: .so, .sl or .dylib @@ -1885,7 +1885,7 @@ dnl Determines shared library suffix SHLIB_DL_SUFFIX_NAME dnl suffix can be: .so or .sl dnl -AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[ +AC_DEFUN([PHP_SHLIB_SUFFIX_NAMES],[ AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME) -- 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/soap/tests/bugs bug30045.phpt
dmitry Mon Apr 10 12:50:02 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/soap/tests/bugsbug30045.phpt
Log:
Fixed test
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug30045.phpt?r1=1.3r2=1.3.2.1diff_format=u
Index: php-src/ext/soap/tests/bugs/bug30045.phpt
diff -u php-src/ext/soap/tests/bugs/bug30045.phpt:1.3
php-src/ext/soap/tests/bugs/bug30045.phpt:1.3.2.1
--- php-src/ext/soap/tests/bugs/bug30045.phpt:1.3 Wed Sep 15 14:36:59 2004
+++ php-src/ext/soap/tests/bugs/bug30045.phpt Mon Apr 10 12:50:02 2006
@@ -42,7 +42,7 @@
try {
printf( %0.0f\n, $num);
$ret = $soap-foo($type, new SoapVar($num, $type));
- printf(%0.0f\n, $num, $ret);
+ printf(%0.0f\n, $ret);
} catch (SoapFault $ex) {
var_dump($ex);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap/tests/bugs bug30045.phpt
dmitry Mon Apr 10 12:50:14 2006 UTC
Modified files:
/php-src/ext/soap/tests/bugsbug30045.phpt
Log:
Fixed test
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug30045.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/soap/tests/bugs/bug30045.phpt
diff -u php-src/ext/soap/tests/bugs/bug30045.phpt:1.3
php-src/ext/soap/tests/bugs/bug30045.phpt:1.4
--- php-src/ext/soap/tests/bugs/bug30045.phpt:1.3 Wed Sep 15 14:36:59 2004
+++ php-src/ext/soap/tests/bugs/bug30045.phpt Mon Apr 10 12:50:14 2006
@@ -42,7 +42,7 @@
try {
printf( %0.0f\n, $num);
$ret = $soap-foo($type, new SoapVar($num, $type));
- printf(%0.0f\n, $num, $ret);
+ printf(%0.0f\n, $ret);
} catch (SoapFault $ex) {
var_dump($ex);
}
--
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_encoding.c /ext/soap/tests/bugs bug36908.phpt bug36908.wsdl
dmitry Mon Apr 10 13:29:49 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/soap/tests/bugsbug36908.phpt bug36908.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #36908 (wsdl default value overrides value in soap request).
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.502r2=1.2027.2.503diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.502 php-src/NEWS:1.2027.2.503
--- php-src/NEWS:1.2027.2.502 Mon Apr 10 09:41:45 2006
+++ php-src/NEWSMon Apr 10 13:29:48 2006
@@ -26,6 +26,8 @@
- Fixed bug #36941 (ArrayIterator does not clone itself). (Marcus)
- Fixed bug #36934 (OCILob-read() doesn't move internal pointer when
reading 0's). (Tony)
+- Fixed bug #36908 (wsdl default value overrides value in soap request).
+ (Dmitry)
- Fixed bug #36898 (__set() leaks in classes extending internal ones).
(Tony, Dmitry)
- Fixed bug #36886 (User filters can leak buckets in some situations). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.19r2=1.103.2.20diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.19
php-src/ext/soap/php_encoding.c:1.103.2.20
--- php-src/ext/soap/php_encoding.c:1.103.2.19 Sun Apr 9 23:35:51 2006
+++ php-src/ext/soap/php_encoding.c Mon Apr 10 13:29:48 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.19 2006/04/09 23:35:51 andrei Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.20 2006/04/10 13:29:48 dmitry Exp $ */
#include time.h
@@ -1128,11 +1128,13 @@
{
switch (model-kind) {
case XSD_CONTENT_ELEMENT:
- if (model-u.element-name) {
- xmlNodePtr node = get_node(data-children,
model-u.element-name);
- if (node) {
- zval *val;
+ if (model-u.element-name) {
+ xmlNodePtr node = get_node(data-children,
model-u.element-name);
+ if (node) {
+ zval *val;
+
+ node = check_and_resolve_href(node);
if (node node-children
node-children-content) {
if (model-u.element-fixed
strcmp(model-u.element-fixed,node-children-content) != 0) {
soap_error3(E_ERROR,
Encoding: Element '%s' has fixed value '%s' (value '%s' is not allowed),
model-u.element-name, model-u.element-fixed, node-children-content);
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36908.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug36908.phpt
+++ php-src/ext/soap/tests/bugs/bug36908.phpt
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36908.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug36908.wsdl
+++ php-src/ext/soap/tests/bugs/bug36908.wsdl
--
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) / NEWS /ext/standard filestat.c
ext/standard/tests/file/bug24313.phpt fails after this patch.
See also http://bugs.php.net/bug.php?id=24313
On 09.04.2006 21:57, Ilia Alshanetsky wrote:
iliaa Sun Apr 9 17:57:27 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/standard filestat.c
Log:
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.499r2=1.2027.2.500diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.499 php-src/NEWS:1.2027.2.500
--- php-src/NEWS:1.2027.2.499 Fri Apr 7 14:20:56 2006
+++ php-src/NEWSSun Apr 9 17:57:27 2006
@@ -29,6 +29,7 @@
- Fixed bug #36886 (User filters can leak buckets in some situations). (Ilia)
- Fixed bug #36878 (error messages are printed even though an exception has
been thrown). (Tony)
+- Fixed bug #36875 (is_*() functions do not account for open_basedir). (Ilia)
- Fixed bug #36869 (memory leak in output buffering when using chunked output).
(Tony)
- Fixed bug #36859 (DOMElement crashes when calling __construct when
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.5r2=1.136.2.6diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.5
php-src/ext/standard/filestat.c:1.136.2.6
--- php-src/ext/standard/filestat.c:1.136.2.5 Mon Mar 6 20:21:52 2006
+++ php-src/ext/standard/filestat.c Sun Apr 9 17:57:27 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.136.2.5 2006/03/06 20:21:52 rrichards Exp $ */
+/* $Id: filestat.c,v 1.136.2.6 2006/04/09 17:57:27 iliaa Exp $ */
#include php.h
#include safe_mode.h
@@ -607,15 +607,22 @@
int flags = 0, rmask=S_IROTH, wmask=S_IWOTH, xmask=S_IXOTH; /* access
rights defaults to other */
char *stat_sb_names[13]={dev, ino, mode, nlink, uid, gid,
rdev,
size, atime, mtime, ctime, blksize,
blocks};
+ char *local;
+ php_stream_wrapper *wrapper;
if (!filename_length) {
RETURN_FALSE;
}
+ if ((wrapper = php_stream_locate_url_wrapper(filename, local, 0 TSRMLS_CC)) == php_plain_files_wrapper) {
+ if (php_check_open_basedir(local TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
+ }
+
if (IS_ACCESS_CHECK(type)) {
- char *local;
+ if (wrapper == php_plain_files_wrapper) {
- if (php_stream_locate_url_wrapper(filename, local, 0 TSRMLS_CC) == php_plain_files_wrapper) {
switch (type) {
#ifdef F_OK
case FS_EXISTS:
@@ -695,9 +702,6 @@
if (IS_ABLE_CHECK(type) getuid() == 0) {
/* root has special perms on plain_wrapper
But we don't know about root under Netware */
- php_stream_wrapper *wrapper;
-
- wrapper = php_stream_locate_url_wrapper(filename, NULL, 0
TSRMLS_CC);
if (wrapper == php_plain_files_wrapper) {
if (type == FS_IS_X) {
xmask = S_IXROOT;
--
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 /ext/iconv/tests bug16069.phpt eucjp2iso2022jp.phpt eucjp2sjis.phpt eucjp2utf8.phpt iconv001.phpt iconv002.phpt ob_iconv_handler.phpt test.inc translit-failure.phpt translit-utf
sniper Mon Apr 10 14:59:33 2006 UTC
Removed files:
/php-src/ext/iconv/teststest.inc
Modified files:
/php-src/ext/iconv/testsbug16069.phpt eucjp2iso2022jp.phpt
eucjp2sjis.phpt eucjp2utf8.phpt
iconv001.phpt iconv002.phpt
ob_iconv_handler.phpt
translit-failure.phpt translit-utf8.phpt
Log:
cleanup
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/bug16069.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/iconv/tests/bug16069.phpt
diff -u php-src/ext/iconv/tests/bug16069.phpt:1.6
php-src/ext/iconv/tests/bug16069.phpt:1.7
--- php-src/ext/iconv/tests/bug16069.phpt:1.6 Tue Oct 25 14:23:22 2005
+++ php-src/ext/iconv/tests/bug16069.phpt Mon Apr 10 14:59:33 2006
@@ -11,7 +11,6 @@
error_reporting=2039
--FILE--
?php
-/* include('test.inc'); */
/* charset=CP932, KOI8-R */
$str =
\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d;
print iconv( CP932, EUC-JP//TRANSLIT, $str );
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/eucjp2iso2022jp.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/iconv/tests/eucjp2iso2022jp.phpt
diff -u php-src/ext/iconv/tests/eucjp2iso2022jp.phpt:1.7
php-src/ext/iconv/tests/eucjp2iso2022jp.phpt:1.8
--- php-src/ext/iconv/tests/eucjp2iso2022jp.phpt:1.7Tue Oct 25 14:23:22 2005
+++ php-src/ext/iconv/tests/eucjp2iso2022jp.phptMon Apr 10 14:59:33 2006
@@ -8,7 +8,6 @@
unicode.output_encoding=ISO-8859-1
--FILE--
?php
-/* include('test.inc'); */
/* charset=EUC-JP */
function hexdump($str) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/eucjp2sjis.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/iconv/tests/eucjp2sjis.phpt
diff -u php-src/ext/iconv/tests/eucjp2sjis.phpt:1.5
php-src/ext/iconv/tests/eucjp2sjis.phpt:1.6
--- php-src/ext/iconv/tests/eucjp2sjis.phpt:1.5 Tue Oct 25 14:23:22 2005
+++ php-src/ext/iconv/tests/eucjp2sjis.phpt Mon Apr 10 14:59:33 2006
@@ -8,7 +8,6 @@
unicode.output_encoding=ISO-8859-1
--FILE--
?php
-/* include('test.inc'); */
/* charset=EUC-JP */
$str =
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/eucjp2utf8.phpt?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/iconv/tests/eucjp2utf8.phpt
diff -u php-src/ext/iconv/tests/eucjp2utf8.phpt:1.9
php-src/ext/iconv/tests/eucjp2utf8.phpt:1.10
--- php-src/ext/iconv/tests/eucjp2utf8.phpt:1.9 Tue Oct 25 14:23:22 2005
+++ php-src/ext/iconv/tests/eucjp2utf8.phpt Mon Apr 10 14:59:33 2006
@@ -8,7 +8,6 @@
unicode.output_encoding=ISO-8859-1
--FILE--
?php
-/* include('test.inc'); */
/* charset=EUC-JP */
$str =
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/iconv001.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/iconv/tests/iconv001.phpt
diff -u php-src/ext/iconv/tests/iconv001.phpt:1.6
php-src/ext/iconv/tests/iconv001.phpt:1.7
--- php-src/ext/iconv/tests/iconv001.phpt:1.6 Tue Oct 25 14:23:22 2005
+++ php-src/ext/iconv/tests/iconv001.phpt Mon Apr 10 14:59:33 2006
@@ -8,7 +8,6 @@
error_reporting=2039
--FILE--
?php
-/* include('test.inc'); */
echo iconv extension is available\n;
$test = æøå;
var_dump(ISO-8859-1: $test);
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/iconv002.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/iconv/tests/iconv002.phpt
diff -u php-src/ext/iconv/tests/iconv002.phpt:1.6
php-src/ext/iconv/tests/iconv002.phpt:1.7
--- php-src/ext/iconv/tests/iconv002.phpt:1.6 Tue Oct 25 14:23:22 2005
+++ php-src/ext/iconv/tests/iconv002.phpt Mon Apr 10 14:59:33 2006
@@ -11,7 +11,6 @@
error_reporting=2039
--FILE--
?php
-/* include('test.inc'); */
/*
Expected output:
#97;#98;#99;#100;
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/ob_iconv_handler.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/iconv/tests/ob_iconv_handler.phpt
diff -u php-src/ext/iconv/tests/ob_iconv_handler.phpt:1.6
php-src/ext/iconv/tests/ob_iconv_handler.phpt:1.7
--- php-src/ext/iconv/tests/ob_iconv_handler.phpt:1.6 Tue Oct 25 14:23:22 2005
+++ php-src/ext/iconv/tests/ob_iconv_handler.phpt Mon Apr 10 14:59:33 2006
@@ -8,7 +8,6 @@
error_reporting=2039
--FILE--
?php
-/* include('test.inc'); */
iconv_set_encoding('internal_encoding', 'EUC-JP');
iconv_set_encoding('output_encoding', 'Shift_JIS');
ob_start('ob_iconv_handler');
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/translit-failure.phpt?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/iconv/tests/translit-failure.phpt
diff -u php-src/ext/iconv/tests/translit-failure.phpt:1.10
php-src/ext/iconv/tests/translit-failure.phpt:1.11
--- php-src/ext/iconv/tests/translit-failure.phpt:1.10 Tue Oct 25
[PHP-CVS] cvs: php-src /ext/session php_session.h session.c /ext/session/tests 007.phpt 008-php4.2.3.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 019.phpt skipif.inc
sniper Mon Apr 10 15:06:51 2006 UTC
Removed files:
/php-src/ext/session/tests 007.phpt 008-php4.2.3.phpt 008.phpt
012.phpt 019.phpt
Modified files:
/php-src/ext/sessionphp_session.h session.c
/php-src/ext/session/tests 009.phpt 010.phpt 011.phpt 013.phpt
014.phpt skipif.inc
Log:
- Cleanup
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/php_session.h?r1=1.105r2=1.106diff_format=u
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.105
php-src/ext/session/php_session.h:1.106
--- php-src/ext/session/php_session.h:1.105 Tue Mar 7 00:20:53 2006
+++ php-src/ext/session/php_session.h Mon Apr 10 15:06:51 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_session.h,v 1.105 2006/03/07 00:20:53 pajoye Exp $ */
+/* $Id: php_session.h,v 1.106 2006/04/10 15:06:51 sniper Exp $ */
#ifndef PHP_SESSION_H
#define PHP_SESSION_H
@@ -111,8 +111,6 @@
long gc_maxlifetime;
int module_number;
long cache_expire;
- zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
- zend_bool bug_compat_warn; /* Whether to warn about it */
const struct ps_serializer_struct *serializer;
zval *http_session_vars;
zend_bool auto_start;
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.432r2=1.433diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.432 php-src/ext/session/session.c:1.433
--- php-src/ext/session/session.c:1.432 Thu Mar 16 09:44:41 2006
+++ php-src/ext/session/session.c Mon Apr 10 15:06:51 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.432 2006/03/16 09:44:41 dmitry Exp $ */
+/* $Id: session.c,v 1.433 2006/04/10 15:06:51 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -145,8 +145,6 @@
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN(session.bug_compat_42,1,
PHP_INI_ALL, OnUpdateBool, bug_compat, php_ps_globals,ps_globals)
- STD_PHP_INI_BOOLEAN(session.bug_compat_warn, 1,
PHP_INI_ALL, OnUpdateBool, bug_compat_warn,php_ps_globals,ps_globals)
STD_PHP_INI_ENTRY(session.save_path, ,
PHP_INI_ALL, OnUpdateSaveDir,save_path, php_ps_globals,ps_globals)
STD_PHP_INI_ENTRY(session.name, PHPSESSID,
PHP_INI_ALL, OnUpdateString, session_name, php_ps_globals,ps_globals)
PHP_INI_ENTRY(session.save_handler, files,
PHP_INI_ALL, OnUpdateSaveHandler)
@@ -723,27 +721,6 @@
int ret = FAILURE;
IF_SESSION_VARS() {
- if (PS(bug_compat)) {
- HashTable *ht = Z_ARRVAL_P(PS(http_session_vars));
- HashPosition pos;
- zval **val;
- int do_warn = 0;
-
- zend_hash_internal_pointer_reset_ex(ht, pos);
-
- while (zend_hash_get_current_data_ex(ht,
- (void **) val, pos) !=
FAILURE) {
- if (Z_TYPE_PP(val) == IS_NULL) {
- if (migrate_global(ht, pos TSRMLS_CC))
- do_warn = 1;
- }
- zend_hash_move_forward_ex(ht, pos);
- }
-
- if (do_warn PS(bug_compat_warn)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
Your script possibly relies on a session side-effect which existed until PHP
4.2.3. Please be advised that the session extension does not consider global
variables as a source of data. You can disable this functionality and this
warning by setting session.bug_compat_42 or session.bug_compat_warn to off,
respectively.);
- }
- }
if (PS(mod_data)) {
char *val;
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/009.phpt?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/session/tests/009.phpt
diff -u php-src/ext/session/tests/009.phpt:1.8
php-src/ext/session/tests/009.phpt:1.9
--- php-src/ext/session/tests/009.phpt:1.8 Mon Mar 27 14:08:10 2006
+++ php-src/ext/session/tests/009.phpt Mon Apr 10 15:06:51 2006
@@ -1,12 +1,10 @@
--TEST--
-unset($_SESSION[name]); should work with register_globals=off
+unset($_SESSION[name]); should work
--SKIPIF--
?php include('skipif.inc'); ?
--INI--
session.use_cookies=0
session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
session.serialize_handler=php
session.save_handler=files
--FILE--
[PHP-CVS] cvs: php-src / INSTALL php.ini-dist php.ini-recommended /ext/mbstring/tests skipif.inc /ext/standard/tests/array bug33940.phpt /main php_variables.c /tests/basic 012.phpt /win32/build M
sniper Mon Apr 10 15:09:15 2006 UTC Modified files: /php-srcINSTALL php.ini-dist php.ini-recommended /php-src/ext/mbstring/tests skipif.inc /php-src/ext/standard/tests/array bug33940.phpt /php-src/main php_variables.c /php-src/tests/basic012.phpt /php-src/win32/buildMakefile config.w32.h.in Log: more cleanup (lingering ini settings which do not exist anymore, etc.) http://cvs.php.net/viewcvs.cgi/php-src/INSTALL?r1=1.37r2=1.38diff_format=u Index: php-src/INSTALL diff -u php-src/INSTALL:1.37 php-src/INSTALL:1.38 --- php-src/INSTALL:1.37Wed Mar 30 13:15:05 2005 +++ php-src/INSTALL Mon Apr 10 15:09:14 2006 @@ -714,12 +714,10 @@ CGI-like environment variables. Simply change your scripts to get CGI variables in the correct way for - PHP 4.x by using the superglobal $_SERVER. If you have older scripts - which use $HTTP_HOST, etc., you should turn on register_globals in - php.ini and change the variable order too (important: remove E from - it, because you do not need the environment here): + PHP 4.x by using the superglobal $_SERVER. + (important: remove E from variables_order because you do not need + the environment here): variables_order = GPCS -register_globals = On _ Special use for error pages or self-made directory listings (PHP = 4.3.3) @@ -1430,7 +1428,6 @@ ; Boolean values can be set to either: ;true, on, yes ; or false, off, no, none -register_globals = off track_errors = yes ; you can enclose strings in double-quotes http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.248r2=1.249diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.248 php-src/php.ini-dist:1.249 --- php-src/php.ini-dist:1.248 Wed Mar 8 14:41:45 2006 +++ php-src/php.ini-distMon Apr 10 15:09:15 2006 @@ -71,9 +71,6 @@ ; Enable the PHP scripting language engine under Apache. engine = On -; Enable compatibility mode with Zend Engine 1 (PHP 4.x) -zend.ze1_compatibility_mode = Off - ; Allow the ? tag. Otherwise, only ?php and script tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP @@ -82,9 +79,6 @@ ; be sure not to use short tags. short_open_tag = On -; Allow ASP-style % % tags. -asp_tags = Off - ; The number of significant digits displayed in floating point numbers. precision= 12 @@ -151,17 +145,6 @@ ; are decoded with unserialize, the data will remain the same. serialize_precision = 100 -; Whether to enable the ability to force arguments to be passed by reference -; at function call time. This method is deprecated and is likely to be -; unsupported in future versions of PHP/Zend. The encouraged method of -; specifying which arguments should be passed by reference is in the function -; declaration. You're encouraged to try and turn this option Off and make -; sure your scripts work properly with it in order to ensure they will work -; with future versions of the language (you will receive a warning each time -; you use this feature, and the argument will be passed by value instead of by -; reference). -allow_call_time_pass_reference = On - ; open_basedir, if set, limits all file operations to the defined directory ; and below. This directive makes most sense if used in a per-directory ; or per-virtualhost web server configuration file. This directive is @@ -353,11 +336,6 @@ ; values override older values. variables_order = EGPCS -; Whether or not to register the old-style input arrays, HTTP_GET_VARS -; and friends. If you're not using them, it's recommended to turn them off, -; for performance reasons. -register_long_arrays = On - ; This directive tells PHP whether to declare the argvargc variables (that ; would contain the GET information). If you don't use these variables, you ; should turn it off for increased performance. @@ -366,8 +344,8 @@ ; When enabled, the SERVER and ENV variables are created when they're first ; used (Just In Time) instead of when the script starts. If these variables ; are not used within a script, having this directive on will result in a -; performance gain. The PHP directives register_long_arrays and -; register_argc_argv must be disabled for this directive to have any affect. +; performance gain. The PHP directive register_argc_argv must be disabled +; for this directive to have any affect. auto_globals_jit = On ; Maximum size of POST data that PHP will accept. @@ -388,7 +366,10 @@ ; Always populate the $HTTP_RAW_POST_DATA variable. ;always_populate_raw_post_data = On -; Unicode settings + +; Unicode settings ; + + unicode_semantics = off unicode.runtime_encoding = iso-8859-1 unicode.script_encoding = utf-8 @@ -421,11 +402,6 @@ ; Directory in which the
[PHP-CVS] cvs: php-src /ext/exif exif.c
helly Mon Apr 10 18:23:15 2006 UTC
Modified files:
/php-src/ext/exif exif.c
Log:
- Fix condition
http://cvs.php.net/viewcvs.cgi/php-src/ext/exif/exif.c?r1=1.179r2=1.180diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.179 php-src/ext/exif/exif.c:1.180
--- php-src/ext/exif/exif.c:1.179 Wed Mar 8 00:43:27 2006
+++ php-src/ext/exif/exif.c Mon Apr 10 18:23:15 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.179 2006/03/08 00:43:27 pajoye Exp $ */
+/* $Id: exif.c,v 1.180 2006/04/10 18:23:15 helly Exp $ */
/* ToDos
*
@@ -115,7 +115,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.179 2006/03/08 00:43:27 pajoye Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.180 2006/04/10 18:23:15 helly Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -1560,7 +1560,7 @@
image_info_data *info_data;
image_info_data *list;
- if (length = LONG_MAX) {
+ if (length 0) {
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c
helly Mon Apr 10 19:48:27 2006 UTC
Modified files:
/php-src/ext/pgsql pgsql.c
Log:
- Fix possible SEGV
http://cvs.php.net/viewcvs.cgi/php-src/ext/pgsql/pgsql.c?r1=1.348r2=1.349diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.348 php-src/ext/pgsql/pgsql.c:1.349
--- php-src/ext/pgsql/pgsql.c:1.348 Wed Mar 29 01:10:27 2006
+++ php-src/ext/pgsql/pgsql.c Mon Apr 10 19:48:27 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.348 2006/03/29 01:10:27 yohgaki Exp $ */
+/* $Id: pgsql.c,v 1.349 2006/04/10 19:48:27 helly Exp $ */
#include stdlib.h
@@ -4586,7 +4586,7 @@
char *field = NULL;
uint field_len = -1;
ulong num_idx = -1;
- zval *meta, **def, **type, **not_null, **has_default, **val, *new_val;
+ zval *meta, **def, **type, **not_null, **has_default, **val, *new_val =
NULL;
int new_len, key_type, err = 0, skip_field;
assert(pg_link != NULL);
@@ -4646,7 +4646,7 @@
if (err) {
break; /* break out for() */
}
- MAKE_STD_ZVAL(new_val);
+ ALLOC_INIT_ZVAL(new_val);
switch(php_pgsql_get_data_type(Z_STRVAL_PP(type),
Z_STRLEN_PP(type)))
{
case PG_BOOL:
@@ -5178,7 +5178,7 @@
break;
} /* switch */
- if (err) {
+ if (err new_val) {
zval_dtor(new_val);
FREE_ZVAL(new_val);
break; /* break out for() */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c
helly Mon Apr 10 19:50:56 2006 UTC
Modified files:
/php-src/ext/pgsql pgsql.c
Log:
- Better order for SEGV prevention
http://cvs.php.net/viewcvs.cgi/php-src/ext/pgsql/pgsql.c?r1=1.349r2=1.350diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.349 php-src/ext/pgsql/pgsql.c:1.350
--- php-src/ext/pgsql/pgsql.c:1.349 Mon Apr 10 19:48:27 2006
+++ php-src/ext/pgsql/pgsql.c Mon Apr 10 19:50:56 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.349 2006/04/10 19:48:27 helly Exp $ */
+/* $Id: pgsql.c,v 1.350 2006/04/10 19:50:56 helly Exp $ */
#include stdlib.h
@@ -4586,7 +4586,7 @@
char *field = NULL;
uint field_len = -1;
ulong num_idx = -1;
- zval *meta, **def, **type, **not_null, **has_default, **val, *new_val =
NULL;
+ zval *meta, **def, **type, **not_null, **has_default, **val, *new_val;
int new_len, key_type, err = 0, skip_field;
assert(pg_link != NULL);
@@ -4608,6 +4608,7 @@
zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void
**)val, pos) == SUCCESS;
zend_hash_move_forward_ex(Z_ARRVAL_P(values), pos)) {
skip_field = 0;
+ new_val = NULL;
if ((key_type =
zend_hash_get_current_key_ex(Z_ARRVAL_P(values), field, field_len, num_idx,
0, pos)) == HASH_KEY_NON_EXISTANT) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to
get array key type);
--
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/pgsql pgsql.c
helly Mon Apr 10 19:51:55 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/pgsql pgsql.c
Log:
- MFH Fix potenbtioal SEGV
http://cvs.php.net/viewcvs.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.12r2=1.331.2.13diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.12
php-src/ext/pgsql/pgsql.c:1.331.2.13
--- php-src/ext/pgsql/pgsql.c:1.331.2.12Tue Mar 28 00:28:02 2006
+++ php-src/ext/pgsql/pgsql.c Mon Apr 10 19:51:55 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.331.2.12 2006/03/28 00:28:02 yohgaki Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13 2006/04/10 19:51:55 helly Exp $ */
#include stdlib.h
@@ -4531,6 +4531,7 @@
zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void
**)val, pos) == SUCCESS;
zend_hash_move_forward_ex(Z_ARRVAL_P(values), pos)) {
skip_field = 0;
+ new_val = NULL;
if ((key_type =
zend_hash_get_current_key_ex(Z_ARRVAL_P(values), field, field_len, num_idx,
0, pos)) == HASH_KEY_NON_EXISTANT) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to
get array key type);
@@ -4569,7 +4570,7 @@
if (err) {
break; /* break out for() */
}
- MAKE_STD_ZVAL(new_val);
+ ALLOC_INIT_ZVAL(new_val);
switch(php_pgsql_get_data_type(Z_STRVAL_PP(type),
Z_STRLEN_PP(type)))
{
case PG_BOOL:
--
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 Apr 10 23:19:23 2006 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
- Coverity issue 59
http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.202r2=1.203diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.202
php-src/ext/simplexml/simplexml.c:1.203
--- php-src/ext/simplexml/simplexml.c:1.202 Wed Mar 29 15:08:52 2006
+++ php-src/ext/simplexml/simplexml.c Mon Apr 10 23:19:23 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.202 2006/03/29 15:08:52 tony2001 Exp $ */
+/* $Id: simplexml.c,v 1.203 2006/04/10 23:19:23 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2055,6 +2055,9 @@
if (intern != NULL intern-node != NULL) {
curnode = (xmlNodePtr)((php_libxml_node_ptr
*)intern-node)-node;
}
+ if (!curnode) {
+ return HASH_KEY_NON_EXISTANT;
+ }
if (UG(unicode)) {
UErrorCode status = U_ZERO_ERROR;
@@ -2258,7 +2261,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.202 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.203 $);
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) /ext/simplexml simplexml.c
helly Mon Apr 10 23:23:09 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/simplexml simplexml.c
Log:
- Coverity issue 59
http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.20r2=1.151.2.21diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.20
php-src/ext/simplexml/simplexml.c:1.151.2.21
--- php-src/ext/simplexml/simplexml.c:1.151.2.20Mon Apr 3 14:59:30 2006
+++ php-src/ext/simplexml/simplexml.c Mon Apr 10 23:23:09 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.20 2006/04/03 14:59:30 tony2001 Exp $ */
+/* $Id: simplexml.c,v 1.151.2.21 2006/04/10 23:23:09 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2107,6 +2107,9 @@
if (intern != NULL intern-node != NULL) {
curnode = (xmlNodePtr)((php_libxml_node_ptr
*)intern-node)-node;
}
+ if (!curnode) {
+ return HASH_KEY_NON_EXISTANT;
+ }
namelen = xmlStrlen(curnode-name);
*str_key = estrndup(curnode-name, namelen);
@@ -2307,7 +2310,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.20 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.21 $);
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 /ext/standard/tests/file bug24313.phpt
iliaa Mon Apr 10 23:48:38 2006 UTC Modified files: /php-src/ext/standard/tests/filebug24313.phpt Log: MFB51: fixed test http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/bug24313.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/file/bug24313.phpt diff -u php-src/ext/standard/tests/file/bug24313.phpt:1.3 php-src/ext/standard/tests/file/bug24313.phpt:1.4 --- php-src/ext/standard/tests/file/bug24313.phpt:1.3 Fri Oct 24 03:31:54 2003 +++ php-src/ext/standard/tests/file/bug24313.phpt Mon Apr 10 23:48:38 2006 @@ -4,7 +4,7 @@ open_basedir=/tmp --FILE-- ?php - var_dump(file_exists(./foobar)); + var_dump(file_exists(/tmp/bogus_file_no_such_thing)); ? --EXPECT-- bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard/tests/file bug24313.phpt
iliaa Mon Apr 10 23:48:47 2006 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/standard/tests/filebug24313.phpt Log: MFH: fixed test http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/bug24313.phpt?r1=1.1.4.1r2=1.1.4.1.6.1diff_format=u Index: php-src/ext/standard/tests/file/bug24313.phpt diff -u php-src/ext/standard/tests/file/bug24313.phpt:1.1.4.1 php-src/ext/standard/tests/file/bug24313.phpt:1.1.4.1.6.1 --- php-src/ext/standard/tests/file/bug24313.phpt:1.1.4.1 Tue Jun 24 13:44:57 2003 +++ php-src/ext/standard/tests/file/bug24313.phpt Mon Apr 10 23:48:47 2006 @@ -4,7 +4,7 @@ open_basedir=/tmp --FILE-- ?php - var_dump(file_exists(./foobar)); + var_dump(file_exists(/tmp/bogus_file_no_such_thing)); ? --EXPECT-- bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
