[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Nov 13 20:31:40 2003 EDT Modified files: /php-srcChangeLog Log: ChangeLog update Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1446 php-src/ChangeLog:1.1447 --- php-src/ChangeLog:1.1446Wed Nov 12 20:31:49 2003 +++ php-src/ChangeLog Thu Nov 13 20:31:38 2003 @@ -1,3 +1,81 @@ +2003-11-13 Marcus Boerger [EMAIL PROTECTED] + +* ext/simplexml/tests/009.phpt: + Fix testcase name + +2003-11-13 Rasmus Lerdorf [EMAIL PROTECTED] + +* ext/imap/php_imap.c: + proto fix + +2003-11-13 Moriyoshi Koizumi [EMAIL PROTECTED] + +* NEWS: + BFN + +* ZendEngine2/zend_operators.c: + Bugfix #26156 (REPLACE_ZVAL_VALUE works on uninit stack-based zvals) + +2003-11-13 Marcus Boerger [EMAIL PROTECTED] + +* ext/simplexml/simplexml.c + ext/simplexml/tests/004.phpt + ext/simplexml/tests/009.phpt + ext/simplexml/tests/009.xml: + Fix classname, CDATA handling (semantically identical to text) and + iterators (Return sub elements as objects, converted to string you get + the text). + +* (PHP_4_3) + ext/dba/dba.c: + MFH: Proto fixes (Friedhelm Betz holliwell|gmx.net) + +* ext/dba/dba.c: + Proto fixes (Friedhelm Betz holliwell|gmx.net) + +2003-11-13 Jani Taskinen [EMAIL PROTECTED] + +* acinclude.m4: + - Fixed build of shared extensions which require openssl and when you only +have static openssl libraries. + +2003-11-13 Edin Kadribasic [EMAIL PROTECTED] + +* ext/gd/libgd/gd_jpeg.c + main/config.w32.h + sapi/cgi/libfcgi/include/fcgi_config_win32.h: + Windows compile fix (patch by [EMAIL PROTECTED]). + +2003-11-13 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + BFN + +* (PHP_4_3) + ext/dba/dba_db2.c + ext/dba/dba_db3.c + ext/dba/dba_db4.c + ext/dba/tests/dba007.phpt: + MFH Bugfix #25794: Cannot open existing hash db3 file with write + +* ext/dba/dba_db2.c + ext/dba/dba_db3.c + ext/dba/dba_db4.c: + Bugfix #25794: Cannot open existing hash db3 file with write + +* ZendEngine2/ZEND_CHANGES + ZendEngine2/zend_interfaces.c: + IteratorAggregate::getIterator() cannot return anythingy else than objects + +* ext/dba/dba.c: + Pass eof + +2003-11-13 Andi Gutmans [EMAIL PROTECTED] + +* ZendEngine2/zend_compile.c: + - Make sure internal clasess are malloced + 2003-11-12 Ilia Alshanetsky [EMAIL PROTECTED] * configure.in
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Nov 13 20:31:43 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.335 ZendEngine2/ChangeLog:1.336 --- ZendEngine2/ChangeLog:1.335 Mon Nov 10 20:31:39 2003 +++ ZendEngine2/ChangeLog Thu Nov 13 20:31:43 2003 @@ -1,3 +1,19 @@ +2003-11-13 Moriyoshi Koizumi [EMAIL PROTECTED] + +* zend_operators.c: + Bugfix #26156 (REPLACE_ZVAL_VALUE works on uninit stack-based zvals) + +2003-11-13 Marcus Boerger [EMAIL PROTECTED] + +* ZEND_CHANGES + zend_interfaces.c: + IteratorAggregate::getIterator() cannot return anythingy else than objects + +2003-11-13 Andi Gutmans [EMAIL PROTECTED] + +* zend_compile.c: + - Make sure internal clasess are malloced + 2003-11-10 Marcus Boerger [EMAIL PROTECTED] * zend_iterators.c: @@ -2052,7 +2068,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.335 2003/11/11 01:31:39 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.336 2003/11/14 01:31:43 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -3776,7 +3792,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.335 2003/11/11 01:31:39 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.336 2003/11/14 01:31:43 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/dba dba_db2.c dba_db3.c dba_db4.c
helly Thu Nov 13 03:59:04 2003 EDT Modified files: /php-src/ext/dbadba_db2.c dba_db3.c dba_db4.c Log: Bugfix #25794: Cannot open existing hash db3 file with write Index: php-src/ext/dba/dba_db2.c diff -u php-src/ext/dba/dba_db2.c:1.35 php-src/ext/dba/dba_db2.c:1.36 --- php-src/ext/dba/dba_db2.c:1.35 Thu Jul 3 07:17:34 2003 +++ php-src/ext/dba/dba_db2.c Thu Nov 13 03:59:02 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dba_db2.c,v 1.35 2003/07/03 11:17:34 helly Exp $ */ +/* $Id: dba_db2.c,v 1.36 2003/11/13 08:59:02 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -55,7 +55,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - !s ? DB_BTREE : DB_UNKNOWN; + s ? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : Index: php-src/ext/dba/dba_db3.c diff -u php-src/ext/dba/dba_db3.c:1.29 php-src/ext/dba/dba_db3.c:1.30 --- php-src/ext/dba/dba_db3.c:1.29 Thu Jul 3 07:17:34 2003 +++ php-src/ext/dba/dba_db3.c Thu Nov 13 03:59:02 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dba_db3.c,v 1.29 2003/07/03 11:17:34 helly Exp $ */ +/* $Id: dba_db3.c,v 1.30 2003/11/13 08:59:02 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -64,7 +64,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - !s? DB_BTREE : DB_UNKNOWN; + s? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : Index: php-src/ext/dba/dba_db4.c diff -u php-src/ext/dba/dba_db4.c:1.11 php-src/ext/dba/dba_db4.c:1.12 --- php-src/ext/dba/dba_db4.c:1.11 Thu Jul 3 07:17:34 2003 +++ php-src/ext/dba/dba_db4.c Thu Nov 13 03:59:02 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: dba_db4.c,v 1.11 2003/07/03 11:17:34 helly Exp $ */ +/* $Id: dba_db4.c,v 1.12 2003/11/13 08:59:02 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -65,7 +65,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - !s? DB_BTREE : DB_UNKNOWN; + s? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/dba dba_db2.c dba_db3.c dba_db4.c /ext/dba/tests dba007.phpt
helly Thu Nov 13 03:59:18 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/dbadba_db2.c dba_db3.c dba_db4.c /php-src/ext/dba/tests dba007.phpt Log: MFH Bugfix #25794: Cannot open existing hash db3 file with write Index: php-src/ext/dba/dba_db2.c diff -u php-src/ext/dba/dba_db2.c:1.30.2.4 php-src/ext/dba/dba_db2.c:1.30.2.5 --- php-src/ext/dba/dba_db2.c:1.30.2.4 Thu Jul 3 07:23:27 2003 +++ php-src/ext/dba/dba_db2.c Thu Nov 13 03:59:16 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dba_db2.c,v 1.30.2.4 2003/07/03 11:23:27 helly Exp $ */ +/* $Id: dba_db2.c,v 1.30.2.5 2003/11/13 08:59:16 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -55,7 +55,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - !s ? DB_BTREE : DB_UNKNOWN; + s ? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : Index: php-src/ext/dba/dba_db3.c diff -u php-src/ext/dba/dba_db3.c:1.21.2.6 php-src/ext/dba/dba_db3.c:1.21.2.7 --- php-src/ext/dba/dba_db3.c:1.21.2.6 Thu Jul 3 07:23:27 2003 +++ php-src/ext/dba/dba_db3.c Thu Nov 13 03:59:16 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dba_db3.c,v 1.21.2.6 2003/07/03 11:23:27 helly Exp $ */ +/* $Id: dba_db3.c,v 1.21.2.7 2003/11/13 08:59:16 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -64,7 +64,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - !s? DB_BTREE : DB_UNKNOWN; + s? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : Index: php-src/ext/dba/dba_db4.c diff -u php-src/ext/dba/dba_db4.c:1.6.2.4 php-src/ext/dba/dba_db4.c:1.6.2.5 --- php-src/ext/dba/dba_db4.c:1.6.2.4 Thu Jul 3 07:23:27 2003 +++ php-src/ext/dba/dba_db4.c Thu Nov 13 03:59:16 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dba_db4.c,v 1.6.2.4 2003/07/03 11:23:27 helly Exp $ */ +/* $Id: dba_db4.c,v 1.6.2.5 2003/11/13 08:59:16 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -64,7 +64,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - !s? DB_BTREE : DB_UNKNOWN; + s? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : Index: php-src/ext/dba/tests/dba007.phpt diff -u php-src/ext/dba/tests/dba007.phpt:1.2.2.2 php-src/ext/dba/tests/dba007.phpt:1.2.2.3 --- php-src/ext/dba/tests/dba007.phpt:1.2.2.2 Thu Jun 19 11:48:18 2003 +++ php-src/ext/dba/tests/dba007.phpt Thu Nov 13 03:59:17 2003 @@ -42,4 +42,4 @@ string(%d) %s/dba/tests/test1.dbm [%d]= string(%d) %s/dba/tests/test2.dbm -} \ No newline at end of file +} -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
helly Thu Nov 13 04:00:49 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.467 php-src/NEWS:1.1247.2.468 --- php-src/NEWS:1.1247.2.467 Wed Nov 12 17:58:00 2003 +++ php-src/NEWSThu Nov 13 04:00:48 2003 @@ -25,6 +25,8 @@ - Fixed bug #26025 (Segfault on glob() without GLOB_NOCHECK or GLOB_NOMAGIC under *BSD platforms). (Moriyoshi) - Fixed bug #26003 (Make fgetcsv() binary safe). (Ilia, Moriyoshi) +- Fixed bug #25794 (Cannot open existing hash db3 file with write ext/dba). + (Marcus) - Fixed bug #25581 (getimagesize () return incorrect values on bitmap (os2) files). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd_jpeg.c /main config.w32.h /sapi/cgi/libfcgi/include fcgi_config_win32.h
edink Thu Nov 13 05:32:06 2003 EDT Modified files: /php-src/ext/gd/libgd gd_jpeg.c /php-src/main config.w32.h /php-src/sapi/cgi/libfcgi/include fcgi_config_win32.h Log: Windows compile fix (patch by [EMAIL PROTECTED]). Index: php-src/ext/gd/libgd/gd_jpeg.c diff -u php-src/ext/gd/libgd/gd_jpeg.c:1.14 php-src/ext/gd/libgd/gd_jpeg.c:1.15 --- php-src/ext/gd/libgd/gd_jpeg.c:1.14 Sat Oct 25 20:42:42 2003 +++ php-src/ext/gd/libgd/gd_jpeg.c Thu Nov 13 05:32:04 2003 @@ -38,10 +38,6 @@ #include jpeglib.h #include jerror.h -#if PHP_WIN32 -typedef SSIZE_T ssize_t; -#endif - static const char *const GD_JPEG_VERSION = 1.0; typedef struct _jmpbuf_wrapper Index: php-src/main/config.w32.h diff -u php-src/main/config.w32.h:1.79 php-src/main/config.w32.h:1.80 --- php-src/main/config.w32.h:1.79 Fri Oct 3 22:51:19 2003 +++ php-src/main/config.w32.h Thu Nov 13 05:32:04 2003 @@ -2,7 +2,7 @@ Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). - $Id: config.w32.h,v 1.79 2003/10/04 02:51:19 moriyoshi Exp $ + $Id: config.w32.h,v 1.80 2003/11/13 10:32:04 edink Exp $ */ /* Default PHP / PEAR directories */ @@ -174,7 +174,7 @@ #define SIZEOF_LONG_LONG_INT 0 #define SIZEOF_LONG_LONG 0 #define SIZEOF_INTMAX_T 0 -#define ssize_t ptrdiff_t +#define ssize_t SSIZE_T #ifdef _WIN64 # define SIZEOF_SIZE_T 8 # define SIZEOF_PTRDIFF_T 8 Index: php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h diff -u php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1 php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.2 --- php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1Tue Nov 26 00:51:16 2002 +++ php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.hThu Nov 13 05:32:05 2003 @@ -106,6 +106,3 @@ /* Define as `__inline' if that's what the C compiler calls it, or to nothing if it is not supported. */ /* #undef inline */ - -/* Define to `int' if sys/types.h does not define. */ -#define ssize_t int \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/gd/libgd gd_jpeg.c /main config.w32.h /sapi/cgi/libfcgi/include fcgi_config_win32.h
Is there a way we can avoid modifying the libfcgi source? This fix will probably be lost when libfcgi is next synced with the official version. --Wez. Index: php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h diff -u php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1 php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.2 --- php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1 Tue Nov 26 00:51:16 2002 +++ php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h Thu Nov 13 05:32:05 2003 @@ -106,6 +106,3 @@ /* Define as `__inline' if that's what the C compiler calls it, or to nothing if it is not supported. */ /* #undef inline */ - -/* Define to `int' if sys/types.h does not define. */ -#define ssize_t int \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/gd/libgd gd_jpeg.c /main config.w32.h /sapi/cgi/libfcgi/include fcgi_config_win32.h
On Thu, 13 Nov 2003, Wez Furlong wrote: Is there a way we can avoid modifying the libfcgi source? This fix will probably be lost when libfcgi is next synced with the official version. Three PHP developers (Shane, Frank, me) have direct commit access to the fcgi repository now, so we can and will push changes upwards. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src /ext/gd/libgd gd_jpeg.c /main config.w32.h /sapi/cgi/libfcgi/include fcgi_config_win32.h
We already did :) The original goes: /* Define to `int' if sys/types.h does not define. */ /* #undef ssize_t */ - Steph -Original Message- From: Wez Furlong [mailto:[EMAIL PROTECTED] Sent: 13 November 2003 11:11 To: Edin Kadribasic; [EMAIL PROTECTED] Subject: Re: [PHP-CVS] cvs: php-src /ext/gd/libgd gd_jpeg.c /main config.w32.h /sapi/cgi/libfcgi/include fcgi_config_win32.h Is there a way we can avoid modifying the libfcgi source? This fix will probably be lost when libfcgi is next synced with the official version. --Wez. Index: php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h diff -u php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1 php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.2 --- php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1 Tue Nov 26 00:51:16 2002 +++ php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h Thu Nov 13 05:32:05 2003 @@ -106,6 +106,3 @@ /* Define as `__inline' if that's what the C compiler calls it, or to nothing if it is not supported. */ /* #undef inline */ - -/* Define to `int' if sys/types.h does not define. */ -#define ssize_t int \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
sniper Thu Nov 13 09:17:48 2003 EDT Modified files: /php-srcacinclude.m4 Log: - Fixed build of shared extensions which require openssl and when you only have static openssl libraries. Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.264 php-src/acinclude.m4:1.265 --- php-src/acinclude.m4:1.264 Fri Oct 3 00:29:13 2003 +++ php-src/acinclude.m4Thu Nov 13 09:17:47 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.264 2003/10/03 04:29:13 sniper Exp $ +dnl $Id: acinclude.m4,v 1.265 2003/11/13 14:17:47 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1658,7 +1658,9 @@ ],[ -L$OPENSSL_LIBDIR ]) - + +old_LIBS=$LIBS +LIBS=$LIBS -lcrypto PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [ PHP_ADD_LIBRARY(ssl,,$1) found_openssl=yes @@ -1667,6 +1669,7 @@ ],[ -L$OPENSSL_LIBDIR ]) +LIBS=$old_LIBS fi dnl For apache 1.3.x static build -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / acinclude.m4
sniper Thu Nov 13 09:18:03 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcacinclude.m4 Log: MFH Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.218.2.31 php-src/acinclude.m4:1.218.2.32 --- php-src/acinclude.m4:1.218.2.31 Fri Oct 3 00:29:24 2003 +++ php-src/acinclude.m4Thu Nov 13 09:18:02 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.218.2.31 2003/10/03 04:29:24 sniper Exp $ +dnl $Id: acinclude.m4,v 1.218.2.32 2003/11/13 14:18:02 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1664,7 +1664,9 @@ ],[ -L$OPENSSL_LIBDIR ]) - + +old_LIBS=$LIBS +LIBS=$LIBS -lcrypto PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [ PHP_ADD_LIBRARY(ssl,,$1) found_openssl=yes @@ -1673,6 +1675,7 @@ ],[ -L$OPENSSL_LIBDIR ]) +LIBS=$old_LIBS fi dnl For apache 1.3.x static build -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: confirm unsubscribe from php-cvs@lists.php.net
-- Treasury nuclear North Korea Semtex NSA $400 million in gold bullion Ft. Bragg Marxist cryptographic Khaddafi Iran SDI munitions Rule Psix nitrate [See http://www.aclu.org/echelonwatch/index.html for more about this] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main rfc1867.c
If we allow odd increments (the code actually increased the limit by 1) the boundary check is worthless. The last time I commited something I added a +2 so catch all kinds of off-by-one or off-by-two (this already catched the filename) Example: num_vars = 10 and num_var_max = 11 if (num_vars = num_vars_max) is false and the buffer is not resized but we write to array[10] and array[11] (where array[10] was the last allocated). This happens everytime we allow odd increments. In the current code this is no security threat, because always 2 more are allocated. Nevertheless now the code stays within the boundary and the 2 element safety buffer isnt needed anymore. Stefan -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main rfc1867.c
Okay, thank you for letting me know it in detail. BTW There should have been more cleaner code :) I'll take a look at it if time permits. Moriyoshi On 2003/11/14, at 0:25, Stefan Esser wrote: If we allow odd increments (the code actually increased the limit by 1) the boundary check is worthless. The last time I commited something I added a +2 so catch all kinds of off-by-one or off-by-two (this already catched the filename) Example: num_vars = 10 and num_var_max = 11 if (num_vars = num_vars_max) is false and the buffer is not resized but we write to array[10] and array[11] (where array[10] was the last allocated). This happens everytime we allow odd increments. In the current code this is no security threat, because always 2 more are allocated. Nevertheless now the code stays within the boundary and the 2 element safety buffer isnt needed anymore. Stefan -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dba dba.c
helly Thu Nov 13 14:08:42 2003 EDT
Modified files:
/php-src/ext/dbadba.c
Log:
Proto fixes (Friedhelm Betz holliwell|gmx.net)
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.102 php-src/ext/dba/dba.c:1.103
--- php-src/ext/dba/dba.c:1.102 Thu Nov 13 02:53:15 2003
+++ php-src/ext/dba/dba.c Thu Nov 13 14:08:41 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dba.c,v 1.102 2003/11/13 07:53:15 helly Exp $ */
+/* $Id: dba.c,v 1.103 2003/11/13 19:08:41 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -852,7 +852,7 @@
}
/* }}} */
-/* {{{ proto bool dba_exists(string key, int handle)
+/* {{{ proto bool dba_exists(string key, resource handle)
Checks, if the specified key exists */
PHP_FUNCTION(dba_exists)
{
@@ -867,7 +867,7 @@
}
/* }}} */
-/* {{{ proto string dba_fetch(string key, [int skip ,] int handle)
+/* {{{ proto string dba_fetch(string key, [int skip ,] resource handle)
Fetches the data associated with key */
PHP_FUNCTION(dba_fetch)
{
@@ -941,7 +941,7 @@
}
/* }}} */
-/* {{{ proto string dba_firstkey(int handle)
+/* {{{ proto string dba_firstkey(resource handle)
Resets the internal key pointer and returns the first key */
PHP_FUNCTION(dba_firstkey)
{
@@ -956,7 +956,7 @@
}
/* }}} */
-/* {{{ proto string dba_nextkey(int handle)
+/* {{{ proto string dba_nextkey(resource handle)
Returns the next key */
PHP_FUNCTION(dba_nextkey)
{
@@ -971,7 +971,7 @@
}
/* }}} */
-/* {{{ proto bool dba_delete(string key, int handle)
+/* {{{ proto bool dba_delete(string key, resource handle)
Deletes the entry associated with key
If inifile: remove all other key lines */
PHP_FUNCTION(dba_delete)
@@ -990,7 +990,7 @@
}
/* }}} */
-/* {{{ proto bool dba_insert(string key, string value, int handle)
+/* {{{ proto bool dba_insert(string key, string value, resource handle)
If not inifile: Insert value as key, return false, if key exists already
If inifile: Add vakue as key (next instance of key) */
PHP_FUNCTION(dba_insert)
@@ -999,7 +999,7 @@
}
/* }}} */
-/* {{{ proto bool dba_replace(string key, string value, int handle)
+/* {{{ proto bool dba_replace(string key, string value, resource handle)
Inserts value as key, replaces key, if key exists already
If inifile: remove all other key lines */
PHP_FUNCTION(dba_replace)
@@ -1008,7 +1008,7 @@
}
/* }}} */
-/* {{{ proto bool dba_optimize(int handle)
+/* {{{ proto bool dba_optimize(resource handle)
Optimizes (e.g. clean up, vacuum) database */
PHP_FUNCTION(dba_optimize)
{
@@ -1022,7 +1022,7 @@
}
/* }}} */
-/* {{{ proto bool dba_sync(int handle)
+/* {{{ proto bool dba_sync(resource handle)
Synchronizes database */
PHP_FUNCTION(dba_sync)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/dba dba.c
helly Thu Nov 13 14:09:25 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/dbadba.c
Log:
MFH: Proto fixes (Friedhelm Betz holliwell|gmx.net)
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.61.2.22 php-src/ext/dba/dba.c:1.61.2.23
--- php-src/ext/dba/dba.c:1.61.2.22 Thu Aug 28 13:56:51 2003
+++ php-src/ext/dba/dba.c Thu Nov 13 14:09:24 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dba.c,v 1.61.2.22 2003/08/28 17:56:51 iliaa Exp $ */
+/* $Id: dba.c,v 1.61.2.23 2003/11/13 19:09:24 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -829,7 +829,7 @@
}
/* }}} */
-/* {{{ proto bool dba_exists(string key, int handle)
+/* {{{ proto bool dba_exists(string key, resource handle)
Checks, if the specified key exists */
PHP_FUNCTION(dba_exists)
{
@@ -844,7 +844,7 @@
}
/* }}} */
-/* {{{ proto string dba_fetch(string key, [int skip ,] int handle)
+/* {{{ proto string dba_fetch(string key, [int skip ,] resource handle)
Fetches the data associated with key */
PHP_FUNCTION(dba_fetch)
{
@@ -888,7 +888,7 @@
}
/* }}} */
-/* {{{ proto string dba_firstkey(int handle)
+/* {{{ proto string dba_firstkey(resource handle)
Resets the internal key pointer and returns the first key */
PHP_FUNCTION(dba_firstkey)
{
@@ -903,7 +903,7 @@
}
/* }}} */
-/* {{{ proto string dba_nextkey(int handle)
+/* {{{ proto string dba_nextkey(resource handle)
Returns the next key */
PHP_FUNCTION(dba_nextkey)
{
@@ -918,7 +918,7 @@
}
/* }}} */
-/* {{{ proto bool dba_delete(string key, int handle)
+/* {{{ proto bool dba_delete(string key, resource handle)
Deletes the entry associated with key
If inifile: remove all other key lines */
PHP_FUNCTION(dba_delete)
@@ -937,7 +937,7 @@
}
/* }}} */
-/* {{{ proto bool dba_insert(string key, string value, int handle)
+/* {{{ proto bool dba_insert(string key, string value, resource handle)
If not inifile: Insert value as key, return false, if key exists already
If inifile: Add vakue as key (next instance of key) */
PHP_FUNCTION(dba_insert)
@@ -946,7 +946,7 @@
}
/* }}} */
-/* {{{ proto bool dba_replace(string key, string value, int handle)
+/* {{{ proto bool dba_replace(string key, string value, resource handle)
Inserts value as key, replaces key, if key exists already
If inifile: remove all other key lines */
PHP_FUNCTION(dba_replace)
@@ -955,7 +955,7 @@
}
/* }}} */
-/* {{{ proto bool dba_optimize(int handle)
+/* {{{ proto bool dba_optimize(resource handle)
Optimizes (e.g. clean up, vacuum) database */
PHP_FUNCTION(dba_optimize)
{
@@ -969,7 +969,7 @@
}
/* }}} */
-/* {{{ proto bool dba_sync(int handle)
+/* {{{ proto bool dba_sync(resource handle)
Synchronizes database */
PHP_FUNCTION(dba_sync)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
moriyoshi Thu Nov 13 15:54:25 2003 EDT Modified files: /php-srcNEWS Log: BFN Index: php-src/NEWS diff -u php-src/NEWS:1.1497 php-src/NEWS:1.1498 --- php-src/NEWS:1.1497 Wed Nov 12 18:42:35 2003 +++ php-src/NEWSThu Nov 13 15:54:25 2003 @@ -8,6 +8,8 @@ - Fixed bug #26083 (Non-working write support in ext/dom). (Ilia) - Fixed bug #24394 (Serializing cross-referenced objects causes segfault). (Moriyoshi) +- Fixed bug #26156 (REPLACE_ZVAL_VALUE works on uninit stack-based zvals). + (Moriyoshi) 30 Oct 2003, PHP 5 Beta 2 - Lots and lots of changes in the Zend Engine 2 since beta 1: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
rasmus Thu Nov 13 15:55:01 2003 EDT
Modified files:
/php-src/ext/imap php_imap.c
Log:
proto fix
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.177 php-src/ext/imap/php_imap.c:1.178
--- php-src/ext/imap/php_imap.c:1.177 Tue Sep 16 15:44:38 2003
+++ php-src/ext/imap/php_imap.c Thu Nov 13 15:55:00 2003
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.177 2003/09/16 19:44:38 hholzgra Exp $ */
+/* $Id: php_imap.c,v 1.178 2003/11/13 20:55:00 rasmus Exp $ */
#define IMAP41
@@ -983,7 +983,7 @@
/* }}} */
-/* {{{ proto array imap_getacl(int stream_id, string mailbox)
+/* {{{ proto array imap_getacl(resource stream_id, string mailbox)
Gets the ACL for a given mailbox */
PHP_FUNCTION(imap_getacl)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests 004.phpt 009.phpt 009.xml
Index: php-src/ext/simplexml/tests/009.phpt
+++ php-src/ext/simplexml/tests/009.phpt
--TEST--
SimpleXML and XPath
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
$sxe = simplexml_load_file(dirname(__FILE__).'/009.xml');
foreach($sxe as $name=$val) {
var_dump($name);
var_dump(get_class($val));
var_dump(trim((string)$val));
}
?
===DONE===
--EXPECT--
string(5) elem1
string(17) simplexml_element
string(10) Bla bla 1.
string(6) elem11
string(17) simplexml_element
string(10) Bla bla 2.
===DONE===
Index: php-src/ext/simplexml/tests/009.xml
+++ php-src/ext/simplexml/tests/009.xml
?xml version='1.0'?
!DOCTYPE sxe SYSTEM notfound.dtd [
!ENTITY % incent SYSTEM sxe.ent
%incent;
]
sxe id=elem1
Plain text.
elem1 attr1='first'
Bla bla 1.
!-- comment --
elem2
Here we have some text data.
elem3
And here some more.
elem4
Wow once again.
/elem4
/elem3
/elem2
/elem1
elem11 attr2='second'
Bla bla 2.
/elem11
/sxe
For me this doesn't looks like a XPath test case... And test #4 is not
working
now because of small leak probably caused by this patch.
Moriyoshi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests 009.phpt
helly Thu Nov 13 16:16:57 2003 EDT Modified files: /php-src/ext/simplexml/tests009.phpt Log: Fix testcase name Index: php-src/ext/simplexml/tests/009.phpt diff -u php-src/ext/simplexml/tests/009.phpt:1.1 php-src/ext/simplexml/tests/009.phpt:1.2 --- php-src/ext/simplexml/tests/009.phpt:1.1Thu Nov 13 15:32:38 2003 +++ php-src/ext/simplexml/tests/009.phptThu Nov 13 16:16:57 2003 @@ -1,5 +1,5 @@ --TEST-- -SimpleXML and XPath +SimpleXML and foreach --SKIPIF-- ?php if (!extension_loaded(simplexml)) print skip; ? --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
At 06:14 PM 11/12/2003 -0500, Ilia Alshanetsky wrote: On November 12, 2003 06:02 pm, Moriyoshi Koizumi wrote: Hmm, did you ever think of an idea of allowing float values for usleep() instead of adding one more redundancy to the existing two look-alikes? Actually I have, but you'll notice that unlike other sleep functions nanosleep() can return an array, which allows resuming of sleep if it was interrupted by a signal. Changing functionality of existing functions would break backwards compatibility. Also, unlike usleep() which is BSD 4.3 (not avaliable on all systems) nanosleep is POSIX. Again, this is breaking our naming conventions. (yeah I know there's legacy stuff). How about time_nanosleeop()? Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/dom config.m4 /ext/libxml config.m4 config0.m4 /ext/simplexml config.m4 /ext/xml config.m4
Very cool! Finally. At 11:42 PM 11/12/2003 +, Jani Taskinen wrote: sniper Wed Nov 12 18:42:38 2003 EDT Added files: /php-src/ext/libxml config0.m4 Removed files: /php-src/ext/libxml config.m4 Modified files: /php-srcNEWS /php-src/ext/simplexml config.m4 /php-src/ext/xmlconfig.m4 /php-src/ext/domconfig.m4 Log: - Fixed bug #26072 (--disable-libxml does not work). Index: php-src/NEWS diff -u php-src/NEWS:1.1496 php-src/NEWS:1.1497 --- php-src/NEWS:1.1496 Wed Nov 12 17:02:36 2003 +++ php-src/NEWSWed Nov 12 18:42:35 2003 @@ -4,6 +4,7 @@ - Added new functions: . dba_key_split() to split inifile keys in an array. (Marcus) . nanosleep() signal safe sleep (Magnus, Ilia) +- Fixed bug #26072 (--disable-libxml does not work). (Jani) - Fixed bug #26083 (Non-working write support in ext/dom). (Ilia) - Fixed bug #24394 (Serializing cross-referenced objects causes segfault). (Moriyoshi) Index: php-src/ext/simplexml/config.m4 diff -u php-src/ext/simplexml/config.m4:1.6 php-src/ext/simplexml/config.m4:1.7 --- php-src/ext/simplexml/config.m4:1.6 Mon Jun 30 13:23:52 2003 +++ php-src/ext/simplexml/config.m4 Wed Nov 12 18:42:35 2003 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 2003/06/30 17:23:52 sniper Exp $ +dnl $Id: config.m4,v 1.7 2003/11/12 23:42:35 sniper Exp $ dnl config.m4 for extension simplexml PHP_ARG_ENABLE(simplexml, whether to enable simplexml support, @@ -9,7 +9,7 @@ [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) fi -if test $PHP_SIMPLEXML != no; then +if test $PHP_SIMPLEXML != no test $PHP_LIBXML != no; then PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [ AC_DEFINE(HAVE_SIMPLEXML,1,[ ]) Index: php-src/ext/xml/config.m4 diff -u php-src/ext/xml/config.m4:1.47 php-src/ext/xml/config.m4:1.48 --- php-src/ext/xml/config.m4:1.47 Mon Jun 30 13:23:52 2003 +++ php-src/ext/xml/config.m4 Wed Nov 12 18:42:36 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.47 2003/06/30 17:23:52 sniper Exp $ +dnl $Id: config.m4,v 1.48 2003/11/12 23:42:36 sniper Exp $ dnl PHP_ARG_ENABLE(xml,whether to enable XML support, @@ -13,7 +13,7 @@ PHP_ARG_WITH(libexpat-dir, libexpat install dir, [ --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated)], no, no) -if test $PHP_XML != no; then +if test $PHP_XML != no test $PHP_LIBXML != no -o $PHP_LIBEXPAT_DIR != no; then dnl dnl Default to libxml2. dnl @@ -24,7 +24,7 @@ AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=DIR]) fi ]) - + dnl dnl Check for expat only if --with-libexpat-dir is used. dnl Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.11 php-src/ext/dom/config.m4:1.12 --- php-src/ext/dom/config.m4:1.11 Thu Jul 24 09:18:40 2003 +++ php-src/ext/dom/config.m4 Wed Nov 12 18:42:37 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2003/07/24 13:18:40 rrichards Exp $ +dnl $Id: config.m4,v 1.12 2003/11/12 23:42:37 sniper Exp $ dnl PHP_ARG_ENABLE(dom, whether to enable DOM support, @@ -10,7 +10,7 @@ [ --with-libxml-dir[=DIR] DOM: libxml2 install prefix.], no, no) fi -if test $PHP_DOM != no; then +if test $PHP_DOM != no test $PHP_LIBXML != no; then PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [ AC_DEFINE(HAVE_DOM,1,[ ]) @@ -22,7 +22,7 @@ documenttype.c domimplementationlist.c entity.c \ nodelist.c text.c comment.c domconfiguration.c \ domimplementationsource.c entityreference.c \ - notation.c xpath.c \ +notation.c xpath.c \ typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c], $ext_shared) PHP_SUBST(DOM_SHARED_LIBADD) Index: php-src/ext/libxml/config0.m4 +++ php-src/ext/libxml/config0.m4 dnl dnl $Id: config0.m4,v 1.1 2003/11/12 23:42:38 sniper Exp $ dnl PHP_ARG_ENABLE(libxml, whether to enable LIBXML support, [ --disable-libxmlDisable new LIBXML support.], yes) if test -z $PHP_LIBXML_DIR; then PHP_ARG_WITH(libxml-dir, libxml2 install dir, [ --with-libxml-dir[=DIR] libxml2 install prefix.], no, no) fi if test $PHP_LIBXML != no; then dnl This extension can not be build as shared ext_shared=no PHP_SETUP_LIBXML(LIBXML_SHARED_LIBADD, [ AC_DEFINE(HAVE_LIBXML,1,[ ]) PHP_NEW_EXTENSION(libxml, [libxml.c], $ext_shared) ], [ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) ]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
At 06:50 PM 11/12/2003 -0500, Ilia Alshanetsky wrote: On November 12, 2003 06:34 pm, Moriyoshi Koizumi wrote:Moriyoshi I think it'd rather belong to a matter of stupidity that the user has to choose the available function in order to accomplish a common purpose. Actually they don't act like one another though. Well, the 3 sleep functions we now have are actually quite different. sleep() offers a basic second based functionality. As far as glibc goes sleep() on many platforms is implemented using nanosleep(). usleep() allows sleeping at 1/1,000,000 intervals nanosleep() allows an easy way to sleep for given amount of seconds and sleep precision of up to 1/1,000,000,000 of a second. In addition allowing you to resume sleep if it was interrupted by a signal. To me it seems like each of the 3 functions offer distinct functionality and the user now has greater flexibility, when it comes to pausing their scripts. I agree with Ilia here. I'd keep them separate. Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/yp yp.c
iliaa Thu Nov 13 19:32:22 2003 EDT Modified files: /php-src/ext/yp yp.c Log: Fixed bug #26235 (yp_first/yp_next do not specify correct key length). Index: php-src/ext/yp/yp.c diff -u php-src/ext/yp/yp.c:1.41 php-src/ext/yp/yp.c:1.42 --- php-src/ext/yp/yp.c:1.41Fri Sep 26 06:02:03 2003 +++ php-src/ext/yp/yp.c Thu Nov 13 19:32:21 2003 @@ -16,7 +16,7 @@ | Fredrik Ohrn| +--+ */ -/* $Id: yp.c,v 1.41 2003/09/26 10:02:03 hholzgra Exp $ */ +/* $Id: yp.c,v 1.42 2003/11/14 00:32:21 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -182,7 +182,7 @@ RETURN_FALSE; } array_init(return_value); - add_assoc_stringl_ex(return_value,outkey,outkeylen,outval,outvallen,1); + add_assoc_stringl_ex(return_value,outkey,outkeylen+1,outval,outvallen,1); /* Deprecated */ add_assoc_stringl(return_value,key,outkey,outkeylen,1); @@ -212,7 +212,7 @@ } array_init(return_value); - add_assoc_stringl_ex(return_value,outkey,outkeylen,outval,outvallen,1); + add_assoc_stringl_ex(return_value,outkey,outkeylen+1,outval,outvallen,1); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
