[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Jan 29 01:42:34 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3302r2=1.3303diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3302 php-src/ChangeLog:1.3303 --- php-src/ChangeLog:1.3302Wed Jan 28 01:34:16 2009 +++ php-src/ChangeLog Thu Jan 29 01:42:23 2009 @@ -1,3 +1,119 @@ +2009-01-28 Scott MacVicar sc...@macvicar.net + +* (PHP_5_3) + ext/sqlite3/sqlite3.c: + Fix build on Windows + +2009-01-28 Nuno Lopes nunoplo...@sapo.pt + +* ZendEngine2/zend_stream.c: + MFB: turn the offset parameter of mmap() back to 0 + +* (PHP_5_3) + ZendEngine2/zend_stream.c: + the offset parameter of mmap() must be aligned to a page boundary (although + linux doesnt strictly require it). + use 0 as offset as it will be small and increment the ptrs afterwards + +2009-01-28 Scott MacVicar sc...@macvicar.net + +* (PHP_5_3) + ext/standard/tests/file/filetype_variation3.phpt: + Broken test, skipif sections had a parse error + +2009-01-28 Nuno Lopes nunoplo...@sapo.pt + +* (PHP_5_3) + NEWS: + BFN + +2009-01-28 Felipe Pena felipe...@gmail.com + +* (php_5_3_0beta1) + ext/enchant/enchant.c: + + - Fix build + +2009-01-28 Nuno Lopes nunoplo...@sapo.pt + +* ext/pcre/php_pcre.c + ext/pcre/tests/bug47229.phpt + ext/pcre/tests/preg_quote_basic.phpt: + MFB: fix bug #47229: preg_quote should escape '-' + +* ext/pcre/tests/bug47229.phpt + ext/pcre/tests/bug47229.phpt + ext/pcre/tests/preg_quote_basic.phpt: + + file bug47229.phpt was initially added on branch PHP_5_3. + +* (PHP_5_3) + ext/pcre/php_pcre.c: + fix bug #47229: preg_quote should escape '-' + +2009-01-28 Johannes Schlüter johan...@schlueters.de + +* (PHP_5_2) + ext/standard/tests/mail/.cvsignore + ext/standard/tests/mail/.cvsignore: + - Add .cvsignore + +* ext/standard/tests/mail/.cvsignore + ext/standard/tests/mail/.cvsignore + ext/standard/tests/mail/.cvsignore: +1.1.4; + - Add .cvsignore + +* (PHP_5_3) + NEWS + configure.in + main/php_version.h: + Back to -dev + +* (PHP_5_3) + NEWS + configure.in + main/php_version.h: + PHP 5.3.0beta1 + +* (PHP_5_3) + ext/phar/config.m4: + Properly disable phar for the moment + +2009-01-28 Pierre-Alain Joye pierre@gmail.com + +* (PHP_5_3) + NEWS: + - enchant entry and fix news + +2009-01-28 Steph Fox steph@virgin.net + +* (PHP_5_3) + UPGRADING: + - Skeleton version taken directly from the scratchpad and tidied. + +2009-01-28 Scott MacVicar sc...@macvicar.net + +* (PHP_5_3) + NEWS + ext/phar/config.m4: + Disable Phar on big endian systems for beta 1. + +2009-01-28 Antony Dovgal t...@daylessday.org + +* ext/date/tests/date_sunrise_and_sunset_basic.phpt + ext/date/tests/date_sunrise_and_sunset_basic.phpt + ext/date/tests/date_sunrise_and_sunset_basic.phpt: + fix test + +2009-01-28 Pierre-Alain Joye pierre@gmail.com + +* ext/spl/php_spl.h: + - MFB: fix build + +* win32/php_stdint.h: + - MFB: sync 5.3 + 2009-01-27 Ilia Alshanetsky i...@prohost.org * sapi/apache_hooks/php_apache.c: @@ -28841,7 +28957,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3302 2009/01/28 01:34:16 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3303 2009/01/29 01:42:23 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Jan 29 01:43:34 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1438r2=1.1439diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1438 ZendEngine2/ChangeLog:1.1439 --- ZendEngine2/ChangeLog:1.1438Tue Jan 27 01:39:29 2009 +++ ZendEngine2/ChangeLog Thu Jan 29 01:43:26 2009 @@ -1,3 +1,14 @@ +2009-01-28 Nuno Lopes nunoplo...@sapo.pt + +* zend_stream.c: + MFB: turn the offset parameter of mmap() back to 0 + +* (PHP_5_3) + zend_stream.c: + the offset parameter of mmap() must be aligned to a page boundary (although + linux doesnt strictly require it). + use 0 as offset as it will be small and increment the ptrs afterwards + 2009-01-26 Christian Seiler chris...@gmx.net * (PHP_5_3) @@ -27719,7 +27730,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1438 2009/01/27 01:39:29 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1439 2009/01/29 01:43:26 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -29443,7 +29454,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1438 2009/01/27 01:39:29 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1439 2009/01/29 01:43:26 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
[PHP-CVS] cvs: php-src /win32 php_stdint.h
pajoye Wed Jan 28 10:32:46 2009 UTC Modified files: /php-src/win32 php_stdint.h Log: - MFB: sync 5.3 http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.3r2=1.4diff_format=u Index: php-src/win32/php_stdint.h diff -u php-src/win32/php_stdint.h:1.3 php-src/win32/php_stdint.h:1.4 --- php-src/win32/php_stdint.h:1.3 Wed Dec 31 11:12:40 2008 +++ php-src/win32/php_stdint.h Wed Jan 28 10:32:45 2009 @@ -68,12 +68,22 @@ // 7.18.1.1 Exact-width integer types typedef __int8int8_t; typedef __int16 int16_t; +#ifndef int32_t typedef __int32 int32_t; +#endif +#ifndef int64_t typedef __int64 int64_t; +#endif +#ifndef uint8_t typedef unsigned __int8 uint8_t; +#endif +#ifndef u_char typedef unsigned __int8 u_char; +#endif typedef unsigned __int16 uint16_t; +#ifndef uint32_t typedef unsigned __int32 uint32_t; +#endif typedef unsigned __int64 uint64_t; // 7.18.1.2 Minimum-width integer types -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.h
pajoye Wed Jan 28 10:33:15 2009 UTC Modified files: /php-src/ext/splphp_spl.h Log: - MFB: fix build http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.h?r1=1.29r2=1.30diff_format=u Index: php-src/ext/spl/php_spl.h diff -u php-src/ext/spl/php_spl.h:1.29 php-src/ext/spl/php_spl.h:1.30 --- php-src/ext/spl/php_spl.h:1.29 Mon Jan 26 11:37:46 2009 +++ php-src/ext/spl/php_spl.h Wed Jan 28 10:33:14 2009 @@ -20,6 +20,9 @@ #define PHP_SPL_H #include php.h +#if defined(PHP_WIN32) +#include win32/php_stdint.h +#endif #include stdarg.h #if 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests date_sunrise_and_sunset_basic.phpt
tony2001Wed Jan 28 12:58:51 2009 UTC
Modified files:
/php-src/ext/date/tests date_sunrise_and_sunset_basic.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt
diff -u php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt:1.2
php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt:1.3
--- php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt:1.2 Tue Jan
13 22:29:14 2009
+++ php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt Wed Jan 28
12:58:50 2009
@@ -3,6 +3,7 @@
--FILE--
?php
+date_default_timezone_set('UTC');
/* calculate the sunrise time for Lisbon, Portugal
Latitude: 38.4 North
Longitude: 9 West
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/tests date_sunrise_and_sunset_basic.phpt
tony2001Wed Jan 28 12:58:59 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date/tests date_sunrise_and_sunset_basic.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt
diff -u php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt:1.1.2.3
php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt:1.1.2.4
--- php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt:1.1.2.3 Tue Jan
13 23:08:03 2009
+++ php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt Wed Jan 28
12:58:59 2009
@@ -3,6 +3,8 @@
--FILE--
?php
+date_default_timezone_set('UTC');
+
/* calculate the sunrise time for Lisbon, Portugal
Latitude: 38.4 North
Longitude: 9 West
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/tests date_sunrise_and_sunset_basic.phpt
tony2001Wed Jan 28 12:59:08 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date/tests date_sunrise_and_sunset_basic.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt?r1=1.1.4.3r2=1.1.4.4diff_format=u
Index: php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt
diff -u php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt:1.1.4.3
php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt:1.1.4.4
--- php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt:1.1.4.3 Tue Jan
13 23:10:52 2009
+++ php-src/ext/date/tests/date_sunrise_and_sunset_basic.phpt Wed Jan 28
12:59:08 2009
@@ -3,6 +3,7 @@
--FILE--
?php
+date_default_timezone_set('UTC');
/* calculate the sunrise time for Lisbon, Portugal
Latitude: 38.4 North
Longitude: 9 West
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/phar config.m4
scottmacWed Jan 28 15:53:29 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/ext/phar config.m4 Log: Disable Phar on big endian systems for beta 1. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.475r2=1.2027.2.547.2.965.2.476diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.475 php-src/NEWS:1.2027.2.547.2.965.2.476 --- php-src/NEWS:1.2027.2.547.2.965.2.475 Mon Jan 26 22:34:16 2009 +++ php-src/NEWSWed Jan 28 15:53:28 2009 @@ -6,6 +6,8 @@ - Deprecated session_register(), session_unregister() and session_is_registered(). (Hannes) +- Disabled Phar for big endian systems due to various crash bugs. (Scott) + - Improved DNS API . Added Windows support for dns_check_record(), dns_get_mx(), checkdnsrr() and getmxrr(). (Pierre) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.8r2=1.27.2.9diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.8 php-src/ext/phar/config.m4:1.27.2.9 --- php-src/ext/phar/config.m4:1.27.2.8 Tue Nov 4 01:27:52 2008 +++ php-src/ext/phar/config.m4 Wed Jan 28 15:53:29 2009 @@ -1,10 +1,14 @@ -dnl $Id: config.m4,v 1.27.2.8 2008/11/04 01:27:52 helly Exp $ +dnl $Id: config.m4,v 1.27.2.9 2009/01/28 15:53:29 scottmac Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, [ --disable-phar Disable phar support], yes) if test $PHP_PHAR != no; then + PHP_C_BIGENDIAN + if test $ac_cv_c_bigendian_php = yes; then +AC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) + else PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) AC_MSG_CHECKING([for phar openssl support]) if test $PHP_HASH_SHARED != yes; then @@ -27,4 +31,5 @@ PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT + fi fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / UPGRADING
sfoxWed Jan 28 17:23:28 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcUPGRADING
Log:
- Skeleton version taken directly from the scratchpad and tidied.
@Lukas, Johannes: This is nowhere near complete, and may contain entries that
would be happier in NEWS, but it's OK for the beta IMHO.
http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1r2=1.1.2.3.2.1.2.1diff_format=u
Index: php-src/UPGRADING
diff -u php-src/UPGRADING:1.1.2.3.2.1 php-src/UPGRADING:1.1.2.3.2.1.2.1
--- php-src/UPGRADING:1.1.2.3.2.1 Mon Aug 28 17:18:03 2006
+++ php-src/UPGRADING Wed Jan 28 17:23:28 2009
@@ -1,548 +1,403 @@
-$Id: UPGRADING,v 1.1.2.3.2.1 2006/08/28 17:18:03 tony2001 Exp $
+$Id: UPGRADING,v 1.1.2.3.2.1.2.1 2009/01/28 17:23:28 sfox Exp $
-UPGRADE NOTES - PHP 5.1
+UPGRADE NOTES - PHP 5.3
-1. Changes in reference handling
- a. Overview
- b. Code that worked under PHP 4.3, but now fails
- c. Code that was valid under PHP 4.3, but now throws an error
- d. Code that failed under PHP 4.3, but now works
- e. Code that 'should have worked' under PHP 5.0
- f. Warnings that came and went
-2. Reading []
-3. instanceof, is_a(), is_subclass_of(), catch
-4. Integer values in function parameters
-5. Abstract private methods
-6. Access modifiers in interfaces
-7. Changes in inheritance rules
-8. Class constants
-9. Extensions
- a. Extensions that are gone from the PHP core
- b. Class constants in new PHP 5.1 extensions
-10. Date/time support
-11. Changes in database support
- a. PDO overview
- b. Changes in MySQL support
- c. Changes in SQLite support
-12. Further migration information
-13. Checking for E_STRICT errors
-
-===
-
-1. Changes in reference handling
-
-
-1a. Overview
-
-
-From the PHP script writer's point of view, the change most likely to impact
-legacy code is in the way that references are handled in all PHP versions
-post-dating the PHP 4.4.0 release.
-
-Until and including PHP 4.3, it was possible to send, assign or return
variables
-by reference that should really be returned by value, such as a constant, a
-temporary value (e.g. the result of an expression), or the result of a function
-that had itself been returned by value, as here:
-
-?php
-
-$foo = 123;
-
-function return_value() {
-global $foo;
-return $foo;
-}
-
-$bar = return_value();
-
-?
-
-Although this code would usually work as expected under PHP 4.3, in the general
-case the result is undefined. The Zend Engine could not act correctly on these
-values as references. This bug could and did lead to various hard-to-reproduce
-memory corruption problems, particularly where the code base was large.
-
-In PHP 4.4.0, PHP 5.0.4 and all subsequent PHP releases, the Engine was fixed
-to 'know' when the reference operation is being used on a value that should
-not be referenced. The actual value is now used in such cases, and a warning
-is emitted. The warning takes the form of an E_NOTICE in PHP 4.4.0 and up,
-and E_STRICT in PHP 5.0.4 and up.
-
-Code that could potentially produce memory corruption can no longer do so.
-However, some legacy code might work differently as a result.
-
-1b. Code that worked under PHP 4.3, but now fails
-=
-
-?php
-
-function func($arraykey) {
-return $arraykey; // function returns by value!
-}
-
-$array = array('a', 'b', 'c');
-foreach (array_keys($array) as $key) {
-$y = func($array[$key]);
-$z[] = $y;
-}
-
-var_dump($z);
-
-?
-Running the above script under any version of PHP that pre-dates the reference
-fix would produce this output:
-
-array(3) {
- [0]=
- string(1) a
- [1]=
- string(1) b
- [2]=
- string(1) c
-}
-
-Following the reference fix, the same code would result in:
-
-array(3) {
- [0]=
- string(1) c
- [1]=
- string(1) c
- [2]=
- string(1) c
-}
-
-This is because, following the changes, func() assigns by value. The value
-of $y is re-assigned, and reference-binding is preserved from $z. Prior
-to the fix, the value was assigned by reference, leading $y to be
-re-bound on each assignment. The attempt to bind to a temporary value
-by reference was the cause of the memory corruption.
-
-Such code can be made to work identically in both the pre-fix and the
-post-fix PHP versions. The signature of func() can be altered to return
-by reference, or the reference assignment can be removed from the result
-of func().
-
-?php
-
-function func() {
-return 'function return';
-}
-
-$x = 'original value';
-$y = $x;
-$y = func();
-echo $x;
-
-?
-
-In PHP 4.3 $x would be 'original value', whereas after the changes it would
-be 'function return' - remember that where the function does not return by
-reference, the reference assignment is converted to a regular assignment.
-Again, this can be brought to a common base, either by
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
pajoye Wed Jan 28 18:32:30 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - enchant entry and fix news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.476r2=1.2027.2.547.2.965.2.477diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.476 php-src/NEWS:1.2027.2.547.2.965.2.477 --- php-src/NEWS:1.2027.2.547.2.965.2.476 Wed Jan 28 15:53:28 2009 +++ php-src/NEWSWed Jan 28 18:32:29 2009 @@ -6,8 +6,6 @@ - Deprecated session_register(), session_unregister() and session_is_registered(). (Hannes) -- Disabled Phar for big endian systems due to various crash bugs. (Scott) - - Improved DNS API . Added Windows support for dns_check_record(), dns_get_mx(), checkdnsrr() and getmxrr(). (Pierre) @@ -25,6 +23,8 @@ - Changed open_basedir to allow tightening in runtime contexts. (Sara) - Changed PHP/Zend extensions to use flexible build IDs. (Stas) +- Added new Enchant extension. (Pierre) + - Added support for IDN via ICU in intl, idn_to_ascii and idn_to_utf8. (Pierre) - Added support for SSH via libssh2 in cURL. (Pierre) - Added support for fnmatch() on Windows. (Pierre) @@ -52,6 +52,8 @@ - Re-added socket_create_pair() for Windows in sockets extension. (Kalle) +- Disabled Phar for big endian systems due to various crash bugs. (Scott) + - Fixed building of pdo_sqlite without sqlite3. (Scott) - Fixed bug #47165 (Possible memory corruption when passing return value by -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4
johannesWed Jan 28 20:39:16 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 Log: Properly disable phar for the moment http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.9r2=1.27.2.10diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.9 php-src/ext/phar/config.m4:1.27.2.10 --- php-src/ext/phar/config.m4:1.27.2.9 Wed Jan 28 15:53:29 2009 +++ php-src/ext/phar/config.m4 Wed Jan 28 20:39:15 2009 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.9 2009/01/28 15:53:29 scottmac Exp $ +dnl $Id: config.m4,v 1.27.2.10 2009/01/28 20:39:15 johannes Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -8,6 +8,7 @@ PHP_C_BIGENDIAN if test $ac_cv_c_bigendian_php = yes; then AC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) +PHP_PHAR=no else PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) AC_MSG_CHECKING([for phar openssl support]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS configure.in /main php_version.h
johannesWed Jan 28 21:38:49 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/main php_version.h /php-srcconfigure.in NEWS Log: PHP 5.3.0beta1 http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.50.2.7r2=1.112.2.37.2.50.2.8diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.50.2.7 php-src/main/php_version.h:1.112.2.37.2.50.2.8 --- php-src/main/php_version.h:1.112.2.37.2.50.2.7 Wed Dec 3 21:01:51 2008 +++ php-src/main/php_version.h Wed Jan 28 21:38:45 2009 @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION alpha4-dev -#define PHP_VERSION 5.3.0alpha4-dev +#define PHP_EXTRA_VERSION beta1 +#define PHP_VERSION 5.3.0beta1 #define PHP_VERSION_ID 50300 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.40r2=1.579.2.52.2.77.2.41diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.40 php-src/configure.in:1.579.2.52.2.77.2.41 --- php-src/configure.in:1.579.2.52.2.77.2.40 Sun Jan 11 23:37:16 2009 +++ php-src/configure.inWed Jan 28 21:38:45 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.40 2009/01/11 23:37:16 scottmac Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.41 2009/01/28 21:38:45 johannes Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=0 -PHP_EXTRA_VERSION=alpha4-dev +PHP_EXTRA_VERSION=beta1 PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.477r2=1.2027.2.547.2.965.2.478diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.477 php-src/NEWS:1.2027.2.547.2.965.2.478 --- php-src/NEWS:1.2027.2.547.2.965.2.477 Wed Jan 28 18:32:29 2009 +++ php-src/NEWSWed Jan 28 21:38:45 2009 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2009, PHP 5.3.0 Alpha 4 +29 Jan 2009, PHP 5.3.0 Beta 1 - Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia) - Deprecated session_register(), session_unregister() and -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS configure.in /main php_version.h
johannesWed Jan 28 22:09:56 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/main php_version.h /php-srcconfigure.in NEWS Log: Back to -dev http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.50.2.8r2=1.112.2.37.2.50.2.9diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.50.2.8 php-src/main/php_version.h:1.112.2.37.2.50.2.9 --- php-src/main/php_version.h:1.112.2.37.2.50.2.8 Wed Jan 28 21:38:45 2009 +++ php-src/main/php_version.h Wed Jan 28 22:09:54 2009 @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION beta1 -#define PHP_VERSION 5.3.0beta1 +#define PHP_EXTRA_VERSION beta2-dev +#define PHP_VERSION 5.3.0beta2-dev #define PHP_VERSION_ID 50300 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.41r2=1.579.2.52.2.77.2.42diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.41 php-src/configure.in:1.579.2.52.2.77.2.42 --- php-src/configure.in:1.579.2.52.2.77.2.41 Wed Jan 28 21:38:45 2009 +++ php-src/configure.inWed Jan 28 22:09:54 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.41 2009/01/28 21:38:45 johannes Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.42 2009/01/28 22:09:54 johannes Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=0 -PHP_EXTRA_VERSION=beta1 +PHP_EXTRA_VERSION=beta2-dev PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.478r2=1.2027.2.547.2.965.2.479diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.478 php-src/NEWS:1.2027.2.547.2.965.2.479 --- php-src/NEWS:1.2027.2.547.2.965.2.478 Wed Jan 28 21:38:45 2009 +++ php-src/NEWSWed Jan 28 22:09:55 2009 @@ -1,5 +1,8 @@ PHPNEWS ||| +?? ??? 2009, PHP 5.3.0 Beta 2 + + 29 Jan 2009, PHP 5.3.0 Beta 1 - Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcre php_pcre.c /ext/pcre/tests bug47229.phpt preg_quote_basic.phpt
nlopess Wed Jan 28 22:39:33 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pcre/tests bug47229.phpt
Modified files:
/php-src/ext/pcre php_pcre.c
/php-src/ext/pcre/tests preg_quote_basic.phpt
Log:
fix bug #47229: preg_quote should escape '-'
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.29r2=1.168.2.9.2.21.2.30diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.29
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.30
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.29 Wed Dec 31 11:15:40 2008
+++ php-src/ext/pcre/php_pcre.c Wed Jan 28 22:39:30 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.29 2008/12/31 11:15:40 sebastian Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.30 2009/01/28 22:39:30 nlopess Exp $ */
#include php.h
#include php_ini.h
@@ -1661,6 +1661,7 @@
case '':
case '|':
case ':':
+ case '-':
*q++ = '\\';
*q++ = c;
break;
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_quote_basic.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/pcre/tests/preg_quote_basic.phpt
diff -u php-src/ext/pcre/tests/preg_quote_basic.phpt:1.1.4.2
php-src/ext/pcre/tests/preg_quote_basic.phpt:1.1.4.3
--- php-src/ext/pcre/tests/preg_quote_basic.phpt:1.1.4.2Wed Nov 21
18:22:01 2007
+++ php-src/ext/pcre/tests/preg_quote_basic.phptWed Jan 28 22:39:33 2009
@@ -17,7 +17,7 @@
--EXPECT--
$string_before looks like: /this *-has \ metacharacters^ in $
-$string_after looks like: \/this \*-has \\ metacharacters\^ in \$, with
metacharacters and / (set as delimiter) escaped
+$string_after looks like: \/this \*\-has \\ metacharacters\^ in \$, with
metacharacters and / (set as delimiter) escaped
int(1)
array(1) {
[0]=
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug47229.phpt?view=markuprev=1.1
Index: php-src/ext/pcre/tests/bug47229.phpt
+++ php-src/ext/pcre/tests/bug47229.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcre php_pcre.c /ext/pcre/tests bug47229.phpt preg_quote_basic.phpt
nlopess Wed Jan 28 22:40:37 2009 UTC
Modified files:
/php-src/ext/pcre php_pcre.c
/php-src/ext/pcre/tests bug47229.phpt preg_quote_basic.phpt
Log:
MFB: fix bug #47229: preg_quote should escape '-'
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.245r2=1.246diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.245 php-src/ext/pcre/php_pcre.c:1.246
--- php-src/ext/pcre/php_pcre.c:1.245 Wed Dec 31 11:12:34 2008
+++ php-src/ext/pcre/php_pcre.c Wed Jan 28 22:40:34 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.245 2008/12/31 11:12:34 sebastian Exp $ */
+/* $Id: php_pcre.c,v 1.246 2009/01/28 22:40:34 nlopess Exp $ */
/* TODO
* php_pcre_replace_impl():
@@ -1856,6 +1856,7 @@
case '':
case '|':
case ':':
+ case '-':
*q++ = '\\';
*q++ = c;
break;
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug47229.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pcre/tests/bug47229.phpt
diff -u /dev/null php-src/ext/pcre/tests/bug47229.phpt:1.2
--- /dev/null Wed Jan 28 22:40:36 2009
+++ php-src/ext/pcre/tests/bug47229.phptWed Jan 28 22:40:35 2009
@@ -0,0 +1,37 @@
+--TEST--
+Bug #47229 (preg_quote() doesn't escape -)
+--FILE--
+?php
+
+var_dump(preg_quote('-oh really?'));
+
+// make sure there's no regression in matching
+preg_match('/[a\-c]+/', 'a---b', $m);
+var_dump($m);
+
+preg_match('/[a\-c]+/', 'a\-', $m);
+var_dump($m);
+
+preg_match(/a\-{2,}/, 'aa', $m);
+var_dump($m);
+
+preg_match(/a\-{1,}/, 'a\a', $m);
+var_dump($m);
+
+?
+--EXPECT--
+string(13) \-oh really\?
+array(1) {
+ [0]=
+ string(4) a---
+}
+array(1) {
+ [0]=
+ string(1) a
+}
+array(1) {
+ [0]=
+ string(5) a
+}
+array(0) {
+}
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_quote_basic.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/pcre/tests/preg_quote_basic.phpt
diff -u php-src/ext/pcre/tests/preg_quote_basic.phpt:1.3
php-src/ext/pcre/tests/preg_quote_basic.phpt:1.4
--- php-src/ext/pcre/tests/preg_quote_basic.phpt:1.3Tue May 27 13:54:30 2008
+++ php-src/ext/pcre/tests/preg_quote_basic.phptWed Jan 28 22:40:36 2009
@@ -16,7 +16,7 @@
?
--EXPECT--
$string_before looks like: /this *-has \ metacharacters^ in $
-$string_after looks like: \/this \*-has \\ metacharacters\^ in \$, with
metacharacters and / (set as delimiter) escaped
+$string_after looks like: \/this \*\-has \\ metacharacters\^ in \$, with
metacharacters and / (set as delimiter) escaped
int(1)
array(1) {
[0]=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/enchant enchant.c
felipe Wed Jan 28 22:43:27 2009 UTC
Modified files:
/php-src/ext/enchantenchant.c
Log:
- Fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/enchant/enchant.c?r1=1.18r2=1.19diff_format=u
Index: php-src/ext/enchant/enchant.c
diff -u php-src/ext/enchant/enchant.c:1.18 php-src/ext/enchant/enchant.c:1.19
--- php-src/ext/enchant/enchant.c:1.18 Tue Jan 13 13:30:04 2009
+++ php-src/ext/enchant/enchant.c Wed Jan 28 22:43:25 2009
@@ -16,14 +16,16 @@
| Ilia Alshanetsky i...@prohost.org |
+--+
- $Id: enchant.c,v 1.18 2009/01/13 13:30:04 pajoye Exp $
+ $Id: enchant.c,v 1.19 2009/01/28 22:43:25 felipe Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
#endif
+#if PHP_WIN32
#include glib/glist.h
#include glib/ghash.h
+#endif
#include enchant.h
#include php.h
#include php_ini.h
@@ -261,7 +263,7 @@
php_info_print_table_start();
php_info_print_table_header(2, enchant support, enabled);
php_info_print_table_row(2, Version, PHP_ENCHANT_VERSION);
- php_info_print_table_row(2, Revision, $Revision: 1.18 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.19 $);
php_info_print_table_end();
php_info_print_table_start();
@@ -435,7 +437,7 @@
RETURN_FALSE;
}
- if ((PG(safe_mode) (!php_checkuid(pwl, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(pwl TSRMLS_CC)) {
+ if (php_check_open_basedir(pwl TSRMLS_CC)) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
nlopess Wed Jan 28 22:43:52 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.479r2=1.2027.2.547.2.965.2.480diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.479 php-src/NEWS:1.2027.2.547.2.965.2.480 --- php-src/NEWS:1.2027.2.547.2.965.2.479 Wed Jan 28 22:09:55 2009 +++ php-src/NEWSWed Jan 28 22:43:50 2009 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.3.0 Beta 2 +- Fixed bug #47229 (preg_quote() should escape the '-' char). (Nuno) 29 Jan 2009, PHP 5.3.0 Beta 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_3) /ext/standard/tests/file filetype_variation3.phpt
scottmacWed Jan 28 22:49:15 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filefiletype_variation3.phpt
Log:
Broken test, skipif sections had a parse error
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filetype_variation3.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/filetype_variation3.phpt
diff -u php-src/ext/standard/tests/file/filetype_variation3.phpt:1.1.2.2
php-src/ext/standard/tests/file/filetype_variation3.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/filetype_variation3.phpt:1.1.2.2Fri Jan
23 09:43:35 2009
+++ php-src/ext/standard/tests/file/filetype_variation3.phptWed Jan 28
22:49:14 2009
@@ -8,7 +8,8 @@
die('skip no /dev on Windows');
}
if (!file_exists(/dev/ram0)) {
-die('skip /dev/ram0 not available);
+die('skip /dev/ram0 not available');
+}
?
--FILE--
?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 sqlite3.c
scottmacWed Jan 28 23:58:10 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3sqlite3.c
Log:
Fix build on Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.30r2=1.1.2.31diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.30
php-src/ext/sqlite3/sqlite3.c:1.1.2.31
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.30 Sat Jan 24 13:08:04 2009
+++ php-src/ext/sqlite3/sqlite3.c Wed Jan 28 23:58:09 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.1.2.30 2009/01/24 13:08:04 tony2001 Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.31 2009/01/28 23:58:09 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1011,7 +1011,7 @@
return -1;
}
-PHPAPI php_stream_ops php_stream_sqlite3_ops = {
+static php_stream_ops php_stream_sqlite3_ops = {
php_sqlite3_stream_write,
php_sqlite3_stream_read,
php_sqlite3_stream_close,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/enchant enchant.c
felipe Thu Jan 29 00:15:49 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/enchantenchant.c
Log:
- Re-added safe mode check
http://cvs.php.net/viewvc.cgi/php-src/ext/enchant/enchant.c?r1=1.19r2=1.19.2.1diff_format=u
Index: php-src/ext/enchant/enchant.c
diff -u php-src/ext/enchant/enchant.c:1.19
php-src/ext/enchant/enchant.c:1.19.2.1
--- php-src/ext/enchant/enchant.c:1.19 Wed Jan 28 22:43:25 2009
+++ php-src/ext/enchant/enchant.c Thu Jan 29 00:15:48 2009
@@ -16,13 +16,13 @@
| Ilia Alshanetsky i...@prohost.org |
+--+
- $Id: enchant.c,v 1.19 2009/01/28 22:43:25 felipe Exp $
+ $Id: enchant.c,v 1.19.2.1 2009/01/29 00:15:48 felipe Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include glib/glist.h
#include glib/ghash.h
#endif
@@ -263,7 +263,7 @@
php_info_print_table_start();
php_info_print_table_header(2, enchant support, enabled);
php_info_print_table_row(2, Version, PHP_ENCHANT_VERSION);
- php_info_print_table_row(2, Revision, $Revision: 1.19 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.19.2.1 $);
php_info_print_table_end();
php_info_print_table_start();
@@ -437,7 +437,7 @@
RETURN_FALSE;
}
- if (php_check_open_basedir(pwl TSRMLS_CC)) {
+ if ((PG(safe_mode) (!php_checkuid(pwl, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(pwl TSRMLS_CC)) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/enchant enchant.c
felipe Thu Jan 29 00:36:27 2009 UTC
Modified files:
/php-src/ext/enchantenchant.c
Log:
- Added arginfo
http://cvs.php.net/viewvc.cgi/php-src/ext/enchant/enchant.c?r1=1.19r2=1.20diff_format=u
Index: php-src/ext/enchant/enchant.c
diff -u php-src/ext/enchant/enchant.c:1.19 php-src/ext/enchant/enchant.c:1.20
--- php-src/ext/enchant/enchant.c:1.19 Wed Jan 28 22:43:25 2009
+++ php-src/ext/enchant/enchant.c Thu Jan 29 00:36:25 2009
@@ -16,13 +16,13 @@
| Ilia Alshanetsky i...@prohost.org |
+--+
- $Id: enchant.c,v 1.19 2009/01/28 22:43:25 felipe Exp $
+ $Id: enchant.c,v 1.20 2009/01/29 00:36:25 felipe Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include glib/glist.h
#include glib/ghash.h
#endif
@@ -64,30 +64,76 @@
/* If you declare any globals in php_enchant.h uncomment this:*/
/*ZEND_DECLARE_MODULE_GLOBALS(enchant)*/
+/* {{{ arginfo */
+ZEND_BEGIN_ARG_INFO(arginfo_enchant_broker_init, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_free, 0, 0, 1)
+ ZEND_ARG_INFO(0, broker)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_request_dict, 0, 0, 2)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, tag)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_request_pwl_dict, 0, 0, 2)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_free_dict, 0, 0, 1)
+ ZEND_ARG_INFO(0, dict)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_set_ordering, 0, 0, 3)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, tag)
+ ZEND_ARG_INFO(0, ordering)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_dict_quick_check, 0, 0, 2)
+ ZEND_ARG_INFO(0, dict)
+ ZEND_ARG_INFO(0, word)
+ ZEND_ARG_INFO(1, suggestions)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_dict_check, 0, 0, 2)
+ ZEND_ARG_INFO(0, dict)
+ ZEND_ARG_INFO(0, word)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_dict_store_replacement, 0, 0, 3)
+ ZEND_ARG_INFO(0, dict)
+ ZEND_ARG_INFO(0, mis)
+ ZEND_ARG_INFO(0, cor)
+ZEND_END_ARG_INFO()
+/* }}} */
+
/* {{{ enchant_functions[]
*
* Every user visible function must have an entry in enchant_functions[].
*/
function_entry enchant_functions[] = {
- PHP_FE(enchant_broker_init, NULL)
- PHP_FE(enchant_broker_free, NULL)
- PHP_FE(enchant_broker_get_error, NULL)
- PHP_FE(enchant_broker_list_dicts, NULL)
- PHP_FE(enchant_broker_request_dict, NULL)
- PHP_FE(enchant_broker_request_pwl_dict, NULL)
- PHP_FE(enchant_broker_free_dict, NULL)
- PHP_FE(enchant_broker_dict_exists, NULL)
- PHP_FE(enchant_broker_set_ordering, NULL)
- PHP_FE(enchant_broker_describe, NULL)
- PHP_FE(enchant_dict_check, NULL)
- PHP_FE(enchant_dict_suggest, NULL)
- PHP_FE(enchant_dict_add_to_personal, NULL)
- PHP_FE(enchant_dict_add_to_session, NULL)
- PHP_FE(enchant_dict_is_in_session, NULL)
- PHP_FE(enchant_dict_store_replacement, NULL)
- PHP_FE(enchant_dict_get_error, NULL)
- PHP_FE(enchant_dict_describe, NULL)
- PHP_FE(enchant_dict_quick_check, NULL)
+ PHP_FE(enchant_broker_init,
arginfo_enchant_broker_init)
+ PHP_FE(enchant_broker_free,
arginfo_enchant_broker_free)
+ PHP_FE(enchant_broker_get_error,
arginfo_enchant_broker_free)
+ PHP_FE(enchant_broker_list_dicts,
arginfo_enchant_broker_free)
+ PHP_FE(enchant_broker_request_dict,
arginfo_enchant_broker_request_dict)
+ PHP_FE(enchant_broker_request_pwl_dict,
arginfo_enchant_broker_request_pwl_dict)
+ PHP_FE(enchant_broker_free_dict,
arginfo_enchant_broker_free_dict)
+ PHP_FE(enchant_broker_dict_exists,
arginfo_enchant_broker_request_dict)
+ PHP_FE(enchant_broker_set_ordering,
arginfo_enchant_broker_set_ordering)
+ PHP_FE(enchant_broker_describe,
arginfo_enchant_broker_free)
+ PHP_FE(enchant_dict_check,
arginfo_enchant_dict_check)
+ PHP_FE(enchant_dict_suggest,
arginfo_enchant_dict_check)
+ PHP_FE(enchant_dict_add_to_personal,arginfo_enchant_dict_check)
+ PHP_FE(enchant_dict_add_to_session, arginfo_enchant_dict_check)
+ PHP_FE(enchant_dict_is_in_session,
arginfo_enchant_dict_check)
+ PHP_FE(enchant_dict_store_replacement,
arginfo_enchant_dict_store_replacement)
+ PHP_FE(enchant_dict_get_error,
arginfo_enchant_broker_free_dict)
+ PHP_FE(enchant_dict_describe,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/enchant enchant.c
felipe Thu Jan 29 00:37:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/enchantenchant.c
Log:
- MFH: Added arginfo
http://cvs.php.net/viewvc.cgi/php-src/ext/enchant/enchant.c?r1=1.19.2.1r2=1.19.2.2diff_format=u
Index: php-src/ext/enchant/enchant.c
diff -u php-src/ext/enchant/enchant.c:1.19.2.1
php-src/ext/enchant/enchant.c:1.19.2.2
--- php-src/ext/enchant/enchant.c:1.19.2.1 Thu Jan 29 00:15:48 2009
+++ php-src/ext/enchant/enchant.c Thu Jan 29 00:37:16 2009
@@ -16,7 +16,7 @@
| Ilia Alshanetsky i...@prohost.org |
+--+
- $Id: enchant.c,v 1.19.2.1 2009/01/29 00:15:48 felipe Exp $
+ $Id: enchant.c,v 1.19.2.2 2009/01/29 00:37:16 felipe Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -64,30 +64,76 @@
/* If you declare any globals in php_enchant.h uncomment this:*/
/*ZEND_DECLARE_MODULE_GLOBALS(enchant)*/
+/* {{{ arginfo */
+ZEND_BEGIN_ARG_INFO(arginfo_enchant_broker_init, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_free, 0, 0, 1)
+ ZEND_ARG_INFO(0, broker)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_request_dict, 0, 0, 2)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, tag)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_request_pwl_dict, 0, 0, 2)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_free_dict, 0, 0, 1)
+ ZEND_ARG_INFO(0, dict)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_set_ordering, 0, 0, 3)
+ ZEND_ARG_INFO(0, broker)
+ ZEND_ARG_INFO(0, tag)
+ ZEND_ARG_INFO(0, ordering)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_dict_quick_check, 0, 0, 2)
+ ZEND_ARG_INFO(0, dict)
+ ZEND_ARG_INFO(0, word)
+ ZEND_ARG_INFO(1, suggestions)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_dict_check, 0, 0, 2)
+ ZEND_ARG_INFO(0, dict)
+ ZEND_ARG_INFO(0, word)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_dict_store_replacement, 0, 0, 3)
+ ZEND_ARG_INFO(0, dict)
+ ZEND_ARG_INFO(0, mis)
+ ZEND_ARG_INFO(0, cor)
+ZEND_END_ARG_INFO()
+/* }}} */
+
/* {{{ enchant_functions[]
*
* Every user visible function must have an entry in enchant_functions[].
*/
function_entry enchant_functions[] = {
- PHP_FE(enchant_broker_init, NULL)
- PHP_FE(enchant_broker_free, NULL)
- PHP_FE(enchant_broker_get_error, NULL)
- PHP_FE(enchant_broker_list_dicts, NULL)
- PHP_FE(enchant_broker_request_dict, NULL)
- PHP_FE(enchant_broker_request_pwl_dict, NULL)
- PHP_FE(enchant_broker_free_dict, NULL)
- PHP_FE(enchant_broker_dict_exists, NULL)
- PHP_FE(enchant_broker_set_ordering, NULL)
- PHP_FE(enchant_broker_describe, NULL)
- PHP_FE(enchant_dict_check, NULL)
- PHP_FE(enchant_dict_suggest, NULL)
- PHP_FE(enchant_dict_add_to_personal, NULL)
- PHP_FE(enchant_dict_add_to_session, NULL)
- PHP_FE(enchant_dict_is_in_session, NULL)
- PHP_FE(enchant_dict_store_replacement, NULL)
- PHP_FE(enchant_dict_get_error, NULL)
- PHP_FE(enchant_dict_describe, NULL)
- PHP_FE(enchant_dict_quick_check, NULL)
+ PHP_FE(enchant_broker_init,
arginfo_enchant_broker_init)
+ PHP_FE(enchant_broker_free,
arginfo_enchant_broker_free)
+ PHP_FE(enchant_broker_get_error,
arginfo_enchant_broker_free)
+ PHP_FE(enchant_broker_list_dicts,
arginfo_enchant_broker_free)
+ PHP_FE(enchant_broker_request_dict,
arginfo_enchant_broker_request_dict)
+ PHP_FE(enchant_broker_request_pwl_dict,
arginfo_enchant_broker_request_pwl_dict)
+ PHP_FE(enchant_broker_free_dict,
arginfo_enchant_broker_free_dict)
+ PHP_FE(enchant_broker_dict_exists,
arginfo_enchant_broker_request_dict)
+ PHP_FE(enchant_broker_set_ordering,
arginfo_enchant_broker_set_ordering)
+ PHP_FE(enchant_broker_describe,
arginfo_enchant_broker_free)
+ PHP_FE(enchant_dict_check,
arginfo_enchant_dict_check)
+ PHP_FE(enchant_dict_suggest,
arginfo_enchant_dict_check)
+ PHP_FE(enchant_dict_add_to_personal,arginfo_enchant_dict_check)
+ PHP_FE(enchant_dict_add_to_session, arginfo_enchant_dict_check)
+ PHP_FE(enchant_dict_is_in_session,
arginfo_enchant_dict_check)
+ PHP_FE(enchant_dict_store_replacement,
arginfo_enchant_dict_store_replacement)
+ PHP_FE(enchant_dict_get_error,
arginfo_enchant_broker_free_dict)
+ PHP_FE(enchant_dict_describe,
arginfo_enchant_broker_free_dict)
+
