[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Apr 9 01:33:14 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1469r2=1.1470diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1469 ZendEngine2/ChangeLog:1.1470 --- ZendEngine2/ChangeLog:1.1469Tue Apr 7 01:32:45 2009 +++ ZendEngine2/ChangeLog Thu Apr 9 01:33:14 2009 @@ -1,3 +1,64 @@ +2009-04-08 Stanislav Malyshev s...@zend.com + +* zend_extensions.h: + iadd utility macro + +* (PHP_5_3) + zend_extensions.h: + add utility macro + +2009-04-08 Matt Wilmas php_li...@realplain.com + +* (PHP_5_3) + zend_extensions.c: + MFH: Changed spelling from build to built + +* zend_extensions.c: + Changed spelling from build to built + +2009-04-08 Dmitry Stogov dmi...@zend.com + +* zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h: + Improved specialization (IS_CONST can't be IS_OBJECT) + +* zend_execute_API.c + zend_execute_API.c: + Calculate hash value once + +* zend_compile.c + zend_compile.c: + Removed deprecated code and fixed function name in error message + +* zend_extensions.c + zend_extensions.c + zend_extensions.h + zend_extensions.h: + Added ability to check build_id by extension + +2009-04-08 Felipe Pena felipe...@gmail.com + +* tests/bug47801.phpt + tests/bug47801.phpt: + - Added test + +* tests/bug47801.phpt + tests/bug47801.phpt + tests/bug47801.phpt: +1.1.4; + file bug47801.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + zend_compile.c + zend_execute_API.c + zend_object_handlers.c + zend_vm_def.h + zend_vm_execute.h: + - Fixed bug #47801 (__call() accessed via parent:: operator is provided + incorrect method name) + 2009-04-06 Felipe Pena felipe...@gmail.com * (PHP_5_2) @@ -28380,7 +28441,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1469 2009/04/07 01:32:45 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1470 2009/04/09 01:33:14 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -30104,7 +30165,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1469 2009/04/07 01:32:45 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1470 2009/04/09 01:33:14 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
[PHP-CVS] cvs: php-src / README.RELEASE_PROCESS
bjori Wed Apr 8 08:38:57 2009 UTC Modified files: /php-srcREADME.RELEASE_PROCESS Log: Add guidelines for re-releasing http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.16r2=1.17diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.16 php-src/README.RELEASE_PROCESS:1.17 --- php-src/README.RELEASE_PROCESS:1.16 Tue Feb 10 20:45:27 2009 +++ php-src/README.RELEASE_PROCESS Wed Apr 8 08:38:57 2009 @@ -253,3 +253,38 @@ II. For PHP5: Set $CURRENT_QA_RELEASE_5 to false 12. Rebuild the English and Japanese docs (ask Derick) + + +Re-releasing the same version (or -pl) + + +1. Commit the new binaries to ``phpweb/distributions/`` + +2. Edit ``phpweb/include/version.inc`` and change (X=major release number): + + a. If only releasing for one OS, make sure you edit only those variables + + b. ``$PHP_X_VERSION`` to the correct version + + c. ``$PHP_X_DATE`` to the release date + + d. ``$PHP_X_MD5`` array and update all the md5 sums + + e. Make sure there are no outdated notes or edited date keys in the + ``$RELEASES[X][$PHP_X_VERSION][source]`` array + +3. Add a short notice to phpweb stating that there is a new release, and +highlight the major important things (security fixes) and when it is important +to upgrade. + + a. Call php bin/createNewsEntry in your local phpweb checkout + + b. Add the content for the news entry + +4. Commit all the changes (``include/version.inc``, ``archive/archive.xml``, +``archive/entries/-MM-DD-N.xml``) + +5. Wait an hour or two, then send a mail to php-annou...@lists.php.net, +php-gene...@lists.php.net and intern...@lists.php.net with a text similar to +the news entry. + -- 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) / README.RELEASE_PROCESS
bjori Wed Apr 8 08:39:10 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.RELEASE_PROCESS Log: MFH: Add guidelines for re-releasing http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.16r2=1.1.2.17diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.1.2.16 php-src/README.RELEASE_PROCESS:1.1.2.17 --- php-src/README.RELEASE_PROCESS:1.1.2.16 Tue Feb 10 20:45:42 2009 +++ php-src/README.RELEASE_PROCESS Wed Apr 8 08:39:10 2009 @@ -253,3 +253,38 @@ II. For PHP5: Set $CURRENT_QA_RELEASE_5 to false 12. Rebuild the English and Japanese docs (ask Derick) + + +Re-releasing the same version (or -pl) + + +1. Commit the new binaries to ``phpweb/distributions/`` + +2. Edit ``phpweb/include/version.inc`` and change (X=major release number): + + a. If only releasing for one OS, make sure you edit only those variables + + b. ``$PHP_X_VERSION`` to the correct version + + c. ``$PHP_X_DATE`` to the release date + + d. ``$PHP_X_MD5`` array and update all the md5 sums + + e. Make sure there are no outdated notes or edited date keys in the + ``$RELEASES[X][$PHP_X_VERSION][source]`` array + +3. Add a short notice to phpweb stating that there is a new release, and +highlight the major important things (security fixes) and when it is important +to upgrade. + + a. Call php bin/createNewsEntry in your local phpweb checkout + + b. Add the content for the news entry + +4. Commit all the changes (``include/version.inc``, ``archive/archive.xml``, +``archive/entries/-MM-DD-N.xml``) + +5. Wait an hour or two, then send a mail to php-annou...@lists.php.net, +php-gene...@lists.php.net and intern...@lists.php.net with a text similar to +the news entry. + -- 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) / EXTENSIONS
iliaa Wed Apr 8 13:31:54 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcEXTENSIONS Log: Maintainer file update http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4.2.15r2=1.72.2.4.2.4.2.16diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.72.2.4.2.4.2.15 php-src/EXTENSIONS:1.72.2.4.2.4.2.16 --- php-src/EXTENSIONS:1.72.2.4.2.4.2.15Mon Mar 30 19:49:04 2009 +++ php-src/EXTENSIONS Wed Apr 8 13:31:54 2009 @@ -211,7 +211,7 @@ SINCE: 5.1 --- EXTENSION: pdo_sqlite -PRIMARY MAINTAINER: Unknown +PRIMARY MAINTAINER: Ilia Alshanetsky il...@php.net MAINTENANCE: Odd fixes STATUS: Working SINCE: 5.1 @@ -223,7 +223,7 @@ COMMENT: Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug. --- EXTENSION: sqlite -PRIMARY MAINTAINER: Marcus Boerger he...@php.net, Wez Furlong w...@php.net +PRIMARY MAINTAINER: Marcus Boerger he...@php.net, Wez Furlong w...@php.net, Ilia Alshanetsky il...@php.net MAINTENANCE: Maintained STATUS: Working SINCE: 5.0 (Since 4.3.2 in PECL) -- 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_3) /sapi/cli php_cli.c
Hi, On Wed, 2009-04-08 at 01:28 +0200, Johannes Schlüter wrote: Hi, On Tue, 2009-04-07 at 16:11 +, Arnaud Le Blanc wrote: lbarnaudTue Apr 7 16:11:19 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/cli php_cli.c Log: MFH: Fixed bug #47893 (CLI aborts on non blocking stdout) http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.22.2.21r2=1.129.2.13.2.22.2.22diff_format=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.21 php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.22 --- php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.21 Fri Jan 9 17:21:11 2009 +++ php-src/sapi/cli/php_cli.c Tue Apr 7 16:11:19 2009 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_cli.c,v 1.129.2.13.2.22.2.21 2009/01/09 17:21:11 iliaa Exp $ */ +/* $Id: php_cli.c,v 1.129.2.13.2.22.2.22 2009/04/07 16:11:19 lbarnaud Exp $ */ #include php.h #include php_globals.h @@ -91,6 +91,12 @@ #include php_getopt.h +#ifndef PHP_WIN32 +# define php_select(m, r, w, e, t) select(m, r, w, e, t) +#else +# include win32/select.h +#endif + PHPAPI extern char *php_ini_opened_path; PHPAPI extern char *php_ini_scanned_files; @@ -224,15 +230,38 @@ #define STDOUT_FILENO 1 #endif +static inline int sapi_cli_select(int fd) +{ + fd_set wfd, dfd; + struct timeval tv; + int ret; + + FD_ZERO(wfd); + FD_ZERO(dfd); + + PHP_SAFE_FD_SET(fd, wfd); + + tv.tv_sec = FG(default_socket_timeout); Please test you're code with --enable-maintainer-zts, tsrmls is missing here. Hi, Sorry, forgot my build was not configured for zts. Regards, Arnaud -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /sapi/cli php_cli.c
Hi, On Wed, 2009-04-08 at 00:14 +, Felipe Pena wrote: felipeWed Apr 8 00:14:37 2009 UTC Modified files: /php-src/sapi/cli php_cli.c Log: - Fix ZTS build http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.207r2=1.208diff_format=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.207 php-src/sapi/cli/php_cli.c:1.208 --- php-src/sapi/cli/php_cli.c:1.207 Tue Apr 7 16:10:35 2009 +++ php-src/sapi/cli/php_cli.cWed Apr 8 00:14:37 2009 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_cli.c,v 1.207 2009/04/07 16:10:35 lbarnaud Exp $ */ +/* $Id: php_cli.c,v 1.208 2009/04/08 00:14:37 felipe Exp $ */ #include php.h #include php_globals.h @@ -234,7 +234,7 @@ #define STDOUT_FILENO 1 #endif -static inline int sapi_cli_select(int fd) +static inline int sapi_cli_select(int fd TSRMLS_DC) { fd_set wfd, dfd; struct timeval tv; @@ -253,14 +253,14 @@ return ret != -1; } -static inline size_t sapi_cli_single_write(const char *str, uint str_length) /* {{{ */ +static inline size_t sapi_cli_single_write(const char *str, uint str_length TSRMLS_DC) /* {{{ */ { #ifdef PHP_WRITE_STDOUT long ret; do { ret = write(STDOUT_FILENO, str, str_length); - } while (ret = 0 errno == EAGAIN sapi_cli_select(STDOUT_FILENO)); + } while (ret = 0 errno == EAGAIN sapi_cli_select(STDOUT_FILENO TSRMLS_CC)); if (ret = 0) { return 0; @@ -291,7 +291,7 @@ while (remaining 0) { - ret = sapi_cli_single_write(ptr, remaining); + ret = sapi_cli_single_write(ptr, remaining TSRMLS_CC); if (!ret) { #ifndef PHP_CLI_WIN32_NO_CONSOLE php_handle_aborted_connection(); @@ -1173,7 +1173,7 @@ pos = 0; if (php_last_char != '\0' php_last_char != '\n') { - sapi_cli_single_write(\n, 1); + sapi_cli_single_write(\n, 1 TSRMLS_CC); } if (EG(exception)) { Thanks :) Regards, Arnaud -- 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 strnatcmp.c var_unserializer.c /ext/standard/tests/array bug44929.phpt
rasmus Wed Apr 8 18:10:46 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array bug44929.phpt Modified files: /php-src/ext/standard strnatcmp.c var_unserializer.c Log: Fixed bug #44929 - Better handling of leading zeros http://cvs.php.net/viewvc.cgi/php-src/ext/standard/strnatcmp.c?r1=1.10r2=1.10.8.1diff_format=u Index: php-src/ext/standard/strnatcmp.c diff -u php-src/ext/standard/strnatcmp.c:1.10 php-src/ext/standard/strnatcmp.c:1.10.8.1 --- php-src/ext/standard/strnatcmp.c:1.10 Thu Jul 15 01:26:03 2004 +++ php-src/ext/standard/strnatcmp.cWed Apr 8 18:10:46 2009 @@ -38,7 +38,7 @@ #if 0 static char const *version UNUSED = -$Id: strnatcmp.c,v 1.10 2004/07/15 01:26:03 iliaa Exp $; +$Id: strnatcmp.c,v 1.10.8.1 2009/04/08 18:10:46 rasmus Exp $; #endif /* {{{ compare_right */ @@ -116,10 +116,10 @@ ca = *ap; cb = *bp; /* skip over leading spaces or zeros */ - while (isspace((int)(unsigned char)ca)) + while (isspace((int)(unsigned char)ca) || (ca == '0' ap+1 aend)) ca = *++ap; - while (isspace((int)(unsigned char)cb)) + while (isspace((int)(unsigned char)cb) || (cb == '0' bp+1 bend)) cb = *++bp; /* process run of digits */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.7.2.10r2=1.70.2.4.2.7.2.11diff_format=u Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.10 php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.11 --- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.10 Tue Mar 17 23:07:40 2009 +++ php-src/ext/standard/var_unserializer.c Wed Apr 8 18:10:46 2009 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Tue Mar 17 15:55:10 2009 */ +/* Generated by re2c 0.13.5 on Wed Apr 8 09:34:35 2009 */ #line 1 ext/standard/var_unserializer.re /* +--+ @@ -18,7 +18,7 @@ +--+ */ -/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.10 2009/03/17 23:07:40 felipe Exp $ */ +/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.11 2009/04/08 18:10:46 rasmus Exp $ */ #include php.h #include ext/standard/php_var.h http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug44929.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/bug44929.phpt +++ php-src/ext/standard/tests/array/bug44929.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard strnatcmp.c /ext/standard/tests/array bug44929.phpt
rasmus Wed Apr 8 18:16:06 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array bug44929.phpt Modified files: /php-src/ext/standard strnatcmp.c Log: Fixed bug #44929 - Better handling of leading zeros http://cvs.php.net/viewvc.cgi/php-src/ext/standard/strnatcmp.c?r1=1.10r2=1.10.6.1diff_format=u Index: php-src/ext/standard/strnatcmp.c diff -u php-src/ext/standard/strnatcmp.c:1.10 php-src/ext/standard/strnatcmp.c:1.10.6.1 --- php-src/ext/standard/strnatcmp.c:1.10 Thu Jul 15 01:26:03 2004 +++ php-src/ext/standard/strnatcmp.cWed Apr 8 18:16:06 2009 @@ -38,7 +38,7 @@ #if 0 static char const *version UNUSED = -$Id: strnatcmp.c,v 1.10 2004/07/15 01:26:03 iliaa Exp $; +$Id: strnatcmp.c,v 1.10.6.1 2009/04/08 18:16:06 rasmus Exp $; #endif /* {{{ compare_right */ @@ -116,10 +116,10 @@ ca = *ap; cb = *bp; /* skip over leading spaces or zeros */ - while (isspace((int)(unsigned char)ca)) + while (isspace((int)(unsigned char)ca) || (ca == '0' ap+1 aend)) ca = *++ap; - while (isspace((int)(unsigned char)cb)) + while (isspace((int)(unsigned char)cb) || (cb == '0' bp+1 bend)) cb = *++bp; /* process run of digits */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug44929.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/bug44929.phpt +++ php-src/ext/standard/tests/array/bug44929.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard strnatcmp.c /ext/standard/tests/array bug44929.phpt
rasmus Wed Apr 8 18:18:49 2009 UTC Modified files: /php-src/ext/standard strnatcmp.c /php-src/ext/standard/tests/array bug44929.phpt Log: Fixed bug #44929 - Better handling of leading zeros This is obviously not going to work for Unicode strings, but the whole function needs to be rewritten, so keep it in synch with the other branches for now. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/strnatcmp.c?r1=1.12r2=1.13diff_format=u Index: php-src/ext/standard/strnatcmp.c diff -u php-src/ext/standard/strnatcmp.c:1.12 php-src/ext/standard/strnatcmp.c:1.13 --- php-src/ext/standard/strnatcmp.c:1.12 Mon Jan 1 09:29:32 2007 +++ php-src/ext/standard/strnatcmp.cWed Apr 8 18:18:49 2009 @@ -38,7 +38,7 @@ #if 0 static char const *version UNUSED = -$Id: strnatcmp.c,v 1.12 2007/01/01 09:29:32 sebastian Exp $; +$Id: strnatcmp.c,v 1.13 2009/04/08 18:18:49 rasmus Exp $; #endif /* {{{ compare_right */ @@ -112,10 +112,10 @@ ca = a[ai]; cb = b[bi]; /* skip over leading spaces or zeros */ - while (isspace((int)(unsigned char)ca)) + while (isspace((int)(unsigned char)ca) || (ca == '0' ap+1 aend)) ca = a[++ai]; - while (isspace((int)(unsigned char)cb)) + while (isspace((int)(unsigned char)cb) || (cb == '0' bp+1 bend)) cb = b[++bi]; /* process run of digits */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug44929.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/bug44929.phpt diff -u /dev/null php-src/ext/standard/tests/array/bug44929.phpt:1.2 --- /dev/null Wed Apr 8 18:18:49 2009 +++ php-src/ext/standard/tests/array/bug44929.phpt Wed Apr 8 18:18:49 2009 @@ -0,0 +1,31 @@ +--TEST-- +Bug #44929 (natsort doesn't handle leading zeros well) +--FILE-- +?php +$a = array('001','008','005','00011','03','14','-123','0.002','00','0'); +natsort($a); +var_dump($a); +? +--EXPECT-- +array(10) { + [6]= + string(4) -123 + [7]= + string(5) 0.002 + [8]= + string(2) 00 + [9]= + string(1) 0 + [0]= + string(3) 001 + [4]= + string(2) 03 + [2]= + string(3) 005 + [1]= + string(3) 008 + [3]= + string(5) 00011 + [5]= + string(6) 14 +} -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard strnatcmp.c
andrei Wed Apr 8 20:12:28 2009 UTC Modified files: /php-src/ext/standard strnatcmp.c Log: Fix Rasmus's patch for bug #44929. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/strnatcmp.c?r1=1.13r2=1.14diff_format=u Index: php-src/ext/standard/strnatcmp.c diff -u php-src/ext/standard/strnatcmp.c:1.13 php-src/ext/standard/strnatcmp.c:1.14 --- php-src/ext/standard/strnatcmp.c:1.13 Wed Apr 8 18:18:49 2009 +++ php-src/ext/standard/strnatcmp.cWed Apr 8 20:12:27 2009 @@ -38,7 +38,7 @@ #if 0 static char const *version UNUSED = -$Id: strnatcmp.c,v 1.13 2009/04/08 18:18:49 rasmus Exp $; +$Id: strnatcmp.c,v 1.14 2009/04/08 20:12:27 andrei Exp $; #endif /* {{{ compare_right */ @@ -112,10 +112,10 @@ ca = a[ai]; cb = b[bi]; /* skip over leading spaces or zeros */ - while (isspace((int)(unsigned char)ca) || (ca == '0' ap+1 aend)) + while (isspace((int)(unsigned char)ca) || (ca == '0' ai+1 a_len)) ca = a[++ai]; - while (isspace((int)(unsigned char)cb) || (cb == '0' bp+1 bend)) + while (isspace((int)(unsigned char)cb) || (cb == '0' bi+1 b_len)) cb = b[++bi]; /* process run of digits */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php