[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri May 20 20:34:00 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1988r2=1.1989ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1988 php-src/ChangeLog:1.1989 --- php-src/ChangeLog:1.1988Thu May 19 20:33:21 2005 +++ php-src/ChangeLog Fri May 20 20:33:59 2005 @@ -1,3 +1,90 @@ +2005-05-20 Grant Croker [EMAIL PROTECTED] + +* (PHP_4_3) + ext/ingres_ii/config.m4 + ext/ingres_ii/config.m4: + - Fixed bug #30593 (--with-ingres option generates broken Makefile). + +2005-05-20 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_0) + ext/dom/element.c + ext/dom/node.c: + MFH: correct fix for bug #33059 + - fix issue in other methods + +* ext/dom/element.c + ext/dom/node.c: + - correct fix for bug #33059 + - fix issue in other methods + +2005-05-20 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_0) + NEWS + ext/standard/string.c + ext/standard/tests/strings/bug33076.phpt: + MFH: + fix bug #33076 (str_ireplace() incorrectly counts result string length and + may cause segfault) + add test + +* ext/standard/tests/strings/bug33076.phpt + ext/standard/tests/strings/bug33076.phpt: + + fix bug #33076 (str_ireplace() incorrectly counts result string length and + may cause segfault) + add test + +* ext/standard/string.c: + fix bug #33076 (str_ireplace() incorrectly counts result string length and + may cause segfault) + add test + +2005-05-20 Jani Taskinen [EMAIL PROTECTED] + +* build/shtool: + Update bundled shtool to 2.0.1 (see also bug #33023) + +2005-05-20 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + Update NEWS + +* (PHP_5_0) + NEWS: + - Update NEWS + +* (PHP_5_0) + ext/standard/parsedate.y: + - MFH: Fixed bug #33013: next month was handled wrong. + +* (PHP_4_3) + ext/standard/parsedate.y: + - Fixed bug #33013: next month was done wrong. + +2005-05-20 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS + NEWS + ext/session/session.c + ext/session/session.c: + MFH: fix bug #32944 (Disabling session.use_cookies doesn't prevent reading + session cookies) + +* ext/session/session.c: + fix bug #32944 (Disabling session.use_cookies doesn't prevent reading + session cookies) + +2005-05-20 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS + NEWS: + reorder + 2005-05-19 Rasmus Lerdorf [EMAIL PROTECTED] * (PHP_5_0) @@ -2392,7 +2479,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.1988 2005/05/20 00:33:21 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.1989 2005/05/21 00:33:59 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -5793,7 +5880,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.1988 2005/05/20 00:33:21 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.1989 2005/05/21 00:33:59 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -6274,7 +6361,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.1988 2005/05/20 00:33:21 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.1989 2005/05/21 00:33:59 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -7748,7 +7835,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.1988 2005/05/20 00:33:21 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.1989 2005/05/21 00:33:59 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS] cvs: CVSROOT / avail
rasmus Fri May 20 02:01:49 2005 EDT Modified files: /CVSROOTavail Log: fix karma for grantc http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.977r2=1.978ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.977 CVSROOT/avail:1.978 --- CVSROOT/avail:1.977 Thu May 19 18:10:51 2005 +++ CVSROOT/avail Fri May 20 02:01:48 2005 @@ -132,7 +132,7 @@ avail|alan_k|php-gtk/ext/gtkhtml,php-gtk/ext/scintilla avail|jmoore,alan_k|php-gtk/generator avail|sterling|php-src/ext/bz2 -avail|grantc|ext/ingres_ii +avail|grantc|php-src/ext/ingres_ii avail|tal|php-src/ext/fribidi avail|bmcadams|php-src/ext/ccvs avail|phanto,abrown|php-src/ext/com -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pdo php_pdo_driver.h /ext/pdo_mysql mysql_driver.c mysql_statement.c /ext/pdo_pgsql pgsql_driver.c pgsql_statement.c
On Thu, 19 May 2005, Ilia Alshanetsky wrote: Joe Orton wrote: Furthermore, I'm pretty sure GCC only warns about it if you use -pedantic, i.e. when you explicitly ask it to issue warnings about non-standard language construct. I bet that's in your CFLAGS somewhere, Ilia? I just installed fresh GCC 4.0 and my CFLAGS for it were: -g -O -Wformat=2 -Wall and I saw those messages. I then went to another box running GCC 3.4 to try and replicate the problem and there the trailing comma notices only appeared if the pedantic flag was present. Sheesh..they're just warnings. Ignore them. :) --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
sniper Fri May 20 02:37:30 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: reorder http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.387r2=1.1760.2.388ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.387 php-src/NEWS:1.1760.2.388 --- php-src/NEWS:1.1760.2.387 Thu May 19 12:17:17 2005 +++ php-src/NEWSFri May 20 02:37:30 2005 @@ -1,8 +1,6 @@ PHPNEWS ||| ?? ??? 2005, PHP 5.0.5 -- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per - RFC 2616 section 10.3.5) (Rasmus, Choitel) - Removed php_check_syntax() function which never worked properly. (Ilia) - Added new function mysqli_set_charset (Georg) - Added man pages for phpize and php-config scripts. (Jakub Vrana) @@ -14,6 +12,8 @@ of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey) - Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey) - Fixed bug #33059 (crash when moving xml attribute set in dtd). (Ilia) +- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per + RFC 2616 section 10.3.5) (Rasmus, Choitel) - Fixed bug #33019 (socket errors cause memory leaks in php_strerror()). (jwozniak23 at poczta dot onet dot pl, Tony). - Fixed bug #32956 (mysql_bind_result() doesn't support MYSQL_TYPE_NULL). (Georg) -- 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
sniper Fri May 20 02:36:57 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: reorder http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.905r2=1.1247.2.906ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.905 php-src/NEWS:1.1247.2.906 --- php-src/NEWS:1.1247.2.905 Thu May 19 12:16:44 2005 +++ php-src/NEWSFri May 20 02:36:56 2005 @@ -1,14 +1,14 @@ PHP 4 NEWS ||| ?? ??? 20??, Version 4.?.? -- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per - RFC 2616 section 10.3.5) (Rasmus, Choitel) - Added man pages for phpize and php-config scripts. (Jakub Vrana) - Added support for .cc files in extensions. (Brian) - Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes them sort based on the current locale. (Derick) - Changed sha1_file() and md5_file() functions to use streams instead of low level IO. (Uwe) +- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per + RFC 2616 section 10.3.5) (Rasmus, Choitel) - Fixed bug #33019 (socket errors cause memory leaks in php_strerror()). (jwozniak23 at poczta dot onet dot pl, Tony). - Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez) -- 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 /ext/session session.c
tony2001Fri May 20 06:28:35 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/sessionsession.c
Log:
MFH: fix bug #32944 (Disabling session.use_cookies doesn't prevent reading
session cookies)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.906r2=1.1247.2.907ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.906 php-src/NEWS:1.1247.2.907
--- php-src/NEWS:1.1247.2.906 Fri May 20 02:36:56 2005
+++ php-src/NEWSFri May 20 06:28:34 2005
@@ -12,6 +12,8 @@
- Fixed bug #33019 (socket errors cause memory leaks in php_strerror()).
(jwozniak23 at poczta dot onet dot pl, Tony).
- Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez)
+- Fixed bug #32944 (Disabling session.use_cookies doesn't prevent reading
+ session cookies). (Jani, Tony)
- Fixed bug #32936 (http redirects URLs are not checked for control chars).
(Ilia)
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
- Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony)
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.336.2.50r2=1.336.2.51ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.336.2.50
php-src/ext/session/session.c:1.336.2.51
--- php-src/ext/session/session.c:1.336.2.50Sun Feb 13 12:51:32 2005
+++ php-src/ext/session/session.c Fri May 20 06:28:35 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.336.2.50 2005/02/13 17:51:32 sniper Exp $ */
+/* $Id: session.c,v 1.336.2.51 2005/05/20 10:28:35 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1015,7 +1015,7 @@
*/
if (!PS(id)) {
- if (zend_hash_find(EG(symbol_table), _COOKIE,
+ if (PS(use_cookies) zend_hash_find(EG(symbol_table),
_COOKIE,
sizeof(_COOKIE), (void **) data) ==
SUCCESS
Z_TYPE_PP(data) == IS_ARRAY
zend_hash_find(Z_ARRVAL_PP(data),
PS(session_name),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/session session.c
tony2001Fri May 20 06:28:17 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/sessionsession.c
/php-srcNEWS
Log:
MFH: fix bug #32944 (Disabling session.use_cookies doesn't prevent reading
session cookies)
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.391.2.11r2=1.391.2.12ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.391.2.11
php-src/ext/session/session.c:1.391.2.12
--- php-src/ext/session/session.c:1.391.2.11Wed Mar 23 19:17:53 2005
+++ php-src/ext/session/session.c Fri May 20 06:28:16 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.391.2.11 2005/03/24 00:17:53 tony2001 Exp $ */
+/* $Id: session.c,v 1.391.2.12 2005/05/20 10:28:16 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1134,7 +1134,7 @@
*/
if (!PS(id)) {
- if (zend_hash_find(EG(symbol_table), _COOKIE,
+ if (PS(use_cookies) zend_hash_find(EG(symbol_table),
_COOKIE,
sizeof(_COOKIE), (void **) data) ==
SUCCESS
Z_TYPE_PP(data) == IS_ARRAY
zend_hash_find(Z_ARRVAL_PP(data),
PS(session_name),
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.388r2=1.1760.2.389ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.388 php-src/NEWS:1.1760.2.389
--- php-src/NEWS:1.1760.2.388 Fri May 20 02:37:30 2005
+++ php-src/NEWSFri May 20 06:28:16 2005
@@ -18,6 +18,8 @@
(jwozniak23 at poczta dot onet dot pl, Tony).
- Fixed bug #32956 (mysql_bind_result() doesn't support MYSQL_TYPE_NULL).
(Georg)
- Fixed bug #32947 (Incorrect option for mysqli default password). (Georg)
+- Fixed bug #32944 (Disabling session.use_cookies doesn't prevent reading
+ session cookies). (Jani, Tony)
- Fixed bug #32936 (http redirects URLs are not checked for control chars).
(Ilia)
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries(), invalid pointer). (Jani)
- Fixed bug #32930 (class extending DOMDocument doesn't clone properly). (Rob)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session session.c
tony2001Fri May 20 06:27:50 2005 EDT
Modified files:
/php-src/ext/sessionsession.c
Log:
fix bug #32944 (Disabling session.use_cookies doesn't prevent reading session
cookies)
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.409r2=1.410ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.409 php-src/ext/session/session.c:1.410
--- php-src/ext/session/session.c:1.409 Wed Mar 23 19:17:16 2005
+++ php-src/ext/session/session.c Fri May 20 06:27:49 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.409 2005/03/24 00:17:16 tony2001 Exp $ */
+/* $Id: session.c,v 1.410 2005/05/20 10:27:49 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1133,7 +1133,7 @@
*/
if (!PS(id)) {
- if (zend_hash_find(EG(symbol_table), _COOKIE,
+ if (PS(use_cookies) zend_hash_find(EG(symbol_table),
_COOKIE,
sizeof(_COOKIE), (void **) data) ==
SUCCESS
Z_TYPE_PP(data) == IS_ARRAY
zend_hash_find(Z_ARRVAL_PP(data),
PS(session_name),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard parsedate.y
derick Fri May 20 07:14:01 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard parsedate.y
Log:
- MFH: Fixed bug #33013: next month was handled wrong.
http://cvs.php.net/diff.php/php-src/ext/standard/parsedate.y?r1=1.56.2.1r2=1.56.2.2ty=u
Index: php-src/ext/standard/parsedate.y
diff -u php-src/ext/standard/parsedate.y:1.56.2.1
php-src/ext/standard/parsedate.y:1.56.2.2
--- php-src/ext/standard/parsedate.y:1.56.2.1 Mon Nov 15 11:30:46 2004
+++ php-src/ext/standard/parsedate.yFri May 20 07:14:01 2005
@@ -8,7 +8,7 @@
** This code is in the public domain and has no copyright.
*/
-/* $Id: parsedate.y,v 1.56.2.1 2004/11/15 16:30:46 derick Exp $ */
+/* $Id: parsedate.y,v 1.56.2.2 2005/05/20 11:14:01 derick Exp $ */
#include php.h
@@ -635,7 +635,7 @@
{ now, tDAY_UNIT, 0 },
{ last, tUNUMBER, -1 },
{ this, tUNUMBER, 0 },
-{ next, tUNUMBER, 2 },
+{ next, tUNUMBER, 1 },
{ first, tUNUMBER, 1 },
/* { second,tUNUMBER, 2 }, */
{ third, tUNUMBER, 3 },
--
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/standard parsedate.y
derick Fri May 20 07:13:14 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard parsedate.y
Log:
- Fixed bug #33013: next month was done wrong.
http://cvs.php.net/diff.php/php-src/ext/standard/parsedate.y?r1=1.34.2.7r2=1.34.2.8ty=u
Index: php-src/ext/standard/parsedate.y
diff -u php-src/ext/standard/parsedate.y:1.34.2.7
php-src/ext/standard/parsedate.y:1.34.2.8
--- php-src/ext/standard/parsedate.y:1.34.2.7 Thu Apr 8 15:21:46 2004
+++ php-src/ext/standard/parsedate.yFri May 20 07:13:14 2005
@@ -8,7 +8,7 @@
** This code is in the public domain and has no copyright.
*/
-/* $Id: parsedate.y,v 1.34.2.7 2004/04/08 19:21:46 derick Exp $ */
+/* $Id: parsedate.y,v 1.34.2.8 2005/05/20 11:13:14 derick Exp $ */
#include php.h
@@ -546,7 +546,7 @@
{ now, tDAY_UNIT, 0 },
{ last, tUNUMBER, -1 },
{ this, tUNUMBER, 0 },
-{ next, tUNUMBER, 2 },
+{ next, tUNUMBER, 1 },
{ first, tUNUMBER, 1 },
/* { second,tUNUMBER, 2 }, */
{ third, tUNUMBER, 3 },
--
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
derick Fri May 20 07:15:34 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: Update NEWS http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.907r2=1.1247.2.908ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.907 php-src/NEWS:1.1247.2.908 --- php-src/NEWS:1.1247.2.907 Fri May 20 06:28:34 2005 +++ php-src/NEWSFri May 20 07:15:33 2005 @@ -11,6 +11,8 @@ RFC 2616 section 10.3.5) (Rasmus, Choitel) - Fixed bug #33019 (socket errors cause memory leaks in php_strerror()). (jwozniak23 at poczta dot onet dot pl, Tony). +- Fixed bug #33013 (next month was handled wrong while parsing dates). + (Derick) - Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez) - Fixed bug #32944 (Disabling session.use_cookies doesn't prevent reading session cookies). (Jani, Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS pear/LiveUser_Admin/docs/examples/example 1 User.php
derick Fri May 20 07:15:04 2005 EDT Modified files: (Branch: PHP_5_0) /pear/LiveUser_Admin/docs/examples/example 1 User.php /php-srcNEWS Log: - Update NEWS http://cvs.php.net/diff.php/pear/LiveUser_Admin/docs/examples/example/1?r1=r2=ty=u http://cvs.php.net/diff.php/pear/LiveUser_Admin/docs/examples/example/User.php?r1=1.20r2=1.21ty=u http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.389r2=1.1760.2.390ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.389 php-src/NEWS:1.1760.2.390 --- php-src/NEWS:1.1760.2.389 Fri May 20 06:28:16 2005 +++ php-src/NEWSFri May 20 07:15:03 2005 @@ -16,6 +16,8 @@ RFC 2616 section 10.3.5) (Rasmus, Choitel) - Fixed bug #33019 (socket errors cause memory leaks in php_strerror()). (jwozniak23 at poczta dot onet dot pl, Tony). +- Fixed bug #33013 (next month was handled wrong while parsing dates). + (Derick) - Fixed bug #32956 (mysql_bind_result() doesn't support MYSQL_TYPE_NULL). (Georg) - Fixed bug #32947 (Incorrect option for mysqli default password). (Georg) - Fixed bug #32944 (Disabling session.use_cookies doesn't prevent reading -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/standard string.c /ext/standard/tests/strings bug33076.phpt
tony2001Fri May 20 10:24:17 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/standard/tests/strings bug33076.phpt
Modified files:
/php-src/ext/standard string.c
/php-srcNEWS
Log:
MFH:
fix bug #33076 (str_ireplace() incorrectly counts result string length and
may cause segfault)
add test
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.420.2.7r2=1.420.2.8ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.420.2.7
php-src/ext/standard/string.c:1.420.2.8
--- php-src/ext/standard/string.c:1.420.2.7 Sun Apr 3 14:09:23 2005
+++ php-src/ext/standard/string.c Fri May 20 10:24:16 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.420.2.7 2005/04/03 18:09:23 iliaa Exp $ */
+/* $Id: string.c,v 1.420.2.8 2005/05/20 14:24:16 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2943,7 +2943,7 @@
char *source, *target, *tmp, *source_end=str+len, *tmp_end = NULL;
for (source = str; source source_end; source++) {
- if (*source == from) {
+ if ((case_sensitivity *source == from) || (!case_sensitivity
tolower(*source) == tolower(from))) {
char_count++;
}
}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.390r2=1.1760.2.391ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.390 php-src/NEWS:1.1760.2.391
--- php-src/NEWS:1.1760.2.390 Fri May 20 07:15:03 2005
+++ php-src/NEWSFri May 20 10:24:16 2005
@@ -11,6 +11,8 @@
- Fixed ext/mysqli to allocate less memory when fetching bound params
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
+- Fixed bug #33076 (str_ireplace() incorrectly counts result string length
+ and may cause segfault). (Tony)
- Fixed bug #33059 (crash when moving xml attribute set in dtd). (Ilia)
- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per
RFC 2616 section 10.3.5) (Rasmus, Choitel)
http://cvs.php.net/co.php/php-src/ext/standard/tests/strings/bug33076.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/strings/bug33076.phpt
+++ php-src/ext/standard/tests/strings/bug33076.phpt
--TEST--
Bug #33076 (str_ireplace() incorrectly counts result string length and may
cause segfault)
--FILE--
?php
$value = str_ireplace(t, bz, Text);
var_dump($value);
echo Done\n;
?
--EXPECT--
string(6) bzexbz
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings bug33076.phpt
tony2001Fri May 20 10:23:42 2005 EDT
Added files:
/php-src/ext/standard/tests/strings bug33076.phpt
Modified files:
/php-src/ext/standard string.c
Log:
fix bug #33076 (str_ireplace() incorrectly counts result string length and
may cause segfault)
add test
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.435r2=1.436ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.435 php-src/ext/standard/string.c:1.436
--- php-src/ext/standard/string.c:1.435 Sun Apr 3 14:08:37 2005
+++ php-src/ext/standard/string.c Fri May 20 10:23:41 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.435 2005/04/03 18:08:37 iliaa Exp $ */
+/* $Id: string.c,v 1.436 2005/05/20 14:23:41 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2991,7 +2991,7 @@
char *source, *target, *tmp, *source_end=str+len, *tmp_end = NULL;
for (source = str; source source_end; source++) {
- if (*source == from) {
+ if ((case_sensitivity *source == from) || (!case_sensitivity
tolower(*source) == tolower(from))) {
char_count++;
}
}
http://cvs.php.net/co.php/php-src/ext/standard/tests/strings/bug33076.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/strings/bug33076.phpt
+++ php-src/ext/standard/tests/strings/bug33076.phpt
--TEST--
Bug #33076 (str_ireplace() incorrectly counts result string length and may
cause segfault)
--FILE--
?php
$value = str_ireplace(t, bz, Text);
var_dump($value);
echo Done\n;
?
--EXPECT--
string(6) bzexbz
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom element.c node.c
rrichards Fri May 20 11:01:38 2005 EDT
Modified files:
/php-src/ext/domelement.c node.c
Log:
- correct fix for bug #33059
- fix issue in other methods
http://cvs.php.net/diff.php/php-src/ext/dom/element.c?r1=1.33r2=1.34ty=u
Index: php-src/ext/dom/element.c
diff -u php-src/ext/dom/element.c:1.33 php-src/ext/dom/element.c:1.34
--- php-src/ext/dom/element.c:1.33 Thu May 19 09:47:21 2005
+++ php-src/ext/dom/element.c Fri May 20 11:01:38 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: element.c,v 1.33 2005/05/19 13:47:21 iliaa Exp $ */
+/* $Id: element.c,v 1.34 2005/05/20 15:01:38 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -250,7 +250,7 @@
}
attr = xmlHasProp(nodep,name);
- if (attr != NULL) {
+ if (attr != NULL attr-type != XML_ATTRIBUTE_DECL) {
node_list_unlink(attr-children TSRMLS_CC);
}
attr = xmlSetProp(nodep, name, value);
@@ -294,12 +294,14 @@
RETURN_FALSE;
}
- /* TODO: DTD defined attributes are handled special */
- if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) {
- node_list_unlink(attrp-children TSRMLS_CC);
- xmlUnlinkNode((xmlNodePtr) attrp);
- } else {
- xmlUnlinkNode((xmlNodePtr) attrp);
+ if (attrp-type != XML_ATTRIBUTE_DECL) {
+ if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) {
+ node_list_unlink(attrp-children TSRMLS_CC);
+ xmlUnlinkNode((xmlNodePtr) attrp);
+ xmlFreeProp(attrp);
+ } else {
+ xmlUnlinkNode((xmlNodePtr) attrp);
+ }
}
RETURN_TRUE;
@@ -367,7 +369,7 @@
}
existattrp = xmlHasProp(nodep, attrp-name);
- if (existattrp != NULL) {
+ if (existattrp != NULL existattrp-type != XML_ATTRIBUTE_DECL) {
if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp))
!= NULL
((php_libxml_node_ptr *)oldobj-ptr)-node ==
(xmlNodePtr) attrp)
{
@@ -539,7 +541,7 @@
if (errorcode == 0) {
if (uri_len 0) {
nodep = (xmlNodePtr) xmlHasNsProp(elemp, localname,
uri);
- if (nodep != NULL) {
+ if (nodep != NULL nodep-type != XML_ATTRIBUTE_DECL)
{
node_list_unlink(nodep-children TSRMLS_CC);
}
@@ -577,7 +579,7 @@
}
} else {
attr = xmlHasProp(elemp, localname);
- if (attr != NULL) {
+ if (attr != NULL attr-type != XML_ATTRIBUTE_DECL) {
node_list_unlink(attr-children TSRMLS_CC);
}
attr = xmlSetProp(elemp, localname, value);
@@ -641,7 +643,7 @@
}
}
- if (attrp) {
+ if (attrp attrp-type != XML_ATTRIBUTE_DECL) {
if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) {
node_list_unlink(attrp-children TSRMLS_CC);
xmlUnlinkNode((xmlNodePtr) attrp);
@@ -725,7 +727,7 @@
existattrp = xmlHasProp(nodep, attrp-name);
}
- if (existattrp != NULL) {
+ if (existattrp != NULL existattrp-type != XML_ATTRIBUTE_DECL) {
if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp))
!= NULL
((php_libxml_node_ptr *)oldobj-ptr)-node ==
(xmlNodePtr) attrp)
{
http://cvs.php.net/diff.php/php-src/ext/dom/node.c?r1=1.35r2=1.36ty=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.35 php-src/ext/dom/node.c:1.36
--- php-src/ext/dom/node.c:1.35 Thu Apr 21 17:11:23 2005
+++ php-src/ext/dom/node.c Fri May 20 11:01:38 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.35 2005/04/21 21:11:23 iliaa Exp $ */
+/* $Id: node.c,v 1.36 2005/05/20 15:01:38 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -992,7 +992,7 @@
lastattr = xmlHasProp(refp-parent,
child-name);
else
lastattr = xmlHasNsProp(refp-parent,
child-name, child-ns-href);
- if (lastattr != NULL) {
+ if (lastattr != NULL lastattr-type !=
XML_ATTRIBUTE_DECL) {
if (lastattr != (xmlAttrPtr) child) {
xmlUnlinkNode((xmlNodePtr) lastattr);
php_libxml_node_free_resource((xmlNodePtr) lastattr TSRMLS_CC);
@@ -1034,7 +1034,7 @@
lastattr =
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/dom element.c node.c
rrichards Fri May 20 11:02:49 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/domelement.c node.c
Log:
MFH: correct fix for bug #33059
- fix issue in other methods
http://cvs.php.net/diff.php/php-src/ext/dom/element.c?r1=1.30.2.3r2=1.30.2.4ty=u
Index: php-src/ext/dom/element.c
diff -u php-src/ext/dom/element.c:1.30.2.3 php-src/ext/dom/element.c:1.30.2.4
--- php-src/ext/dom/element.c:1.30.2.3 Thu May 19 09:47:47 2005
+++ php-src/ext/dom/element.c Fri May 20 11:02:48 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: element.c,v 1.30.2.3 2005/05/19 13:47:47 iliaa Exp $ */
+/* $Id: element.c,v 1.30.2.4 2005/05/20 15:02:48 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -250,7 +250,7 @@
}
attr = xmlHasProp(nodep,name);
- if (attr != NULL) {
+ if (attr != NULL attr-type != XML_ATTRIBUTE_DECL) {
node_list_unlink(attr-children TSRMLS_CC);
}
attr = xmlSetProp(nodep, name, value);
@@ -294,12 +294,14 @@
RETURN_FALSE;
}
- /* TODO: DTD defined attributes are handled special */
- if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) {
- node_list_unlink(attrp-children TSRMLS_CC);
- xmlUnlinkNode((xmlNodePtr) attrp);
- } else {
- xmlUnlinkNode((xmlNodePtr) attrp);
+ if (attrp-type != XML_ATTRIBUTE_DECL) {
+ if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) {
+ node_list_unlink(attrp-children TSRMLS_CC);
+ xmlUnlinkNode((xmlNodePtr) attrp);
+ xmlFreeProp(attrp);
+ } else {
+ xmlUnlinkNode((xmlNodePtr) attrp);
+ }
}
RETURN_TRUE;
@@ -367,7 +369,7 @@
}
existattrp = xmlHasProp(nodep, attrp-name);
- if (existattrp != NULL) {
+ if (existattrp != NULL existattrp-type != XML_ATTRIBUTE_DECL) {
if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp))
!= NULL
((php_libxml_node_ptr *)oldobj-ptr)-node ==
(xmlNodePtr) attrp)
{
@@ -539,7 +541,7 @@
if (errorcode == 0) {
if (uri_len 0) {
nodep = (xmlNodePtr) xmlHasNsProp(elemp, localname,
uri);
- if (nodep != NULL) {
+ if (nodep != NULL nodep-type != XML_ATTRIBUTE_DECL)
{
node_list_unlink(nodep-children TSRMLS_CC);
}
@@ -577,7 +579,7 @@
}
} else {
attr = xmlHasProp(elemp, localname);
- if (attr != NULL) {
+ if (attr != NULL attr-type != XML_ATTRIBUTE_DECL) {
node_list_unlink(attr-children TSRMLS_CC);
}
attr = xmlSetProp(elemp, localname, value);
@@ -641,7 +643,7 @@
}
}
- if (attrp) {
+ if (attrp attrp-type != XML_ATTRIBUTE_DECL) {
if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) {
node_list_unlink(attrp-children TSRMLS_CC);
xmlUnlinkNode((xmlNodePtr) attrp);
@@ -725,7 +727,7 @@
existattrp = xmlHasProp(nodep, attrp-name);
}
- if (existattrp != NULL) {
+ if (existattrp != NULL existattrp-type != XML_ATTRIBUTE_DECL) {
if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp))
!= NULL
((php_libxml_node_ptr *)oldobj-ptr)-node ==
(xmlNodePtr) attrp)
{
http://cvs.php.net/diff.php/php-src/ext/dom/node.c?r1=1.29.2.5r2=1.29.2.6ty=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.29.2.5 php-src/ext/dom/node.c:1.29.2.6
--- php-src/ext/dom/node.c:1.29.2.5 Mon Apr 18 19:08:41 2005
+++ php-src/ext/dom/node.c Fri May 20 11:02:48 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.29.2.5 2005/04/18 23:08:41 rrichards Exp $ */
+/* $Id: node.c,v 1.29.2.6 2005/05/20 15:02:48 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -992,7 +992,7 @@
lastattr = xmlHasProp(refp-parent,
child-name);
else
lastattr = xmlHasNsProp(refp-parent,
child-name, child-ns-href);
- if (lastattr != NULL) {
+ if (lastattr != NULL lastattr-type !=
XML_ATTRIBUTE_DECL) {
if (lastattr != (xmlAttrPtr) child) {
xmlUnlinkNode((xmlNodePtr) lastattr);
php_libxml_node_free_resource((xmlNodePtr) lastattr
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/ingres_ii config.m4
grantc Fri May 20 11:57:13 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/ingres_ii config.m4 Log: - Fixed bug #30593 (--with-ingres option generates broken Makefile). http://cvs.php.net/diff.php/php-src/ext/ingres_ii/config.m4?r1=1.8.4.1r2=1.8.4.2ty=u Index: php-src/ext/ingres_ii/config.m4 diff -u php-src/ext/ingres_ii/config.m4:1.8.4.1 php-src/ext/ingres_ii/config.m4:1.8.4.2 --- php-src/ext/ingres_ii/config.m4:1.8.4.1 Thu Jan 23 00:33:17 2003 +++ php-src/ext/ingres_ii/config.m4 Fri May 20 11:57:12 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.4.1 2003/01/23 05:33:17 sniper Exp $ +dnl $Id: config.m4,v 1.8.4.2 2005/05/20 15:57:12 grantc Exp $ dnl PHP_ARG_WITH(ingres, for Ingres II support, @@ -29,7 +29,9 @@ AC_MSG_ERROR(Cannot find libiiapi.a under $II_DIR/lib) fi - PHP_ADD_LIBRARY_WITH_PATH(iiapi, $II_LIB_DIR, II_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(ingres, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(iiapi.1, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(q.1, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(frame.1, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(compat.1, $II_LIB_DIR, II_SHARED_LIBADD) PHP_ADD_INCLUDE($II_INC_DIR) 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_0) /ext/ingres_ii config.m4
grantc Fri May 20 12:13:27 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/ingres_ii config.m4 Log: - Fixed bug #30593 (--with-ingres option generates broken Makefile). http://cvs.php.net/diff.php/php-src/ext/ingres_ii/config.m4?r1=1.9r2=1.9.2.1ty=u Index: php-src/ext/ingres_ii/config.m4 diff -u php-src/ext/ingres_ii/config.m4:1.9 php-src/ext/ingres_ii/config.m4:1.9.2.1 --- php-src/ext/ingres_ii/config.m4:1.9 Thu Jan 23 00:33:09 2003 +++ php-src/ext/ingres_ii/config.m4 Fri May 20 12:13:26 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.9 2003/01/23 05:33:09 sniper Exp $ +dnl $Id: config.m4,v 1.9.2.1 2005/05/20 16:13:26 grantc Exp $ dnl PHP_ARG_WITH(ingres, for Ingres II support, @@ -29,7 +29,9 @@ AC_MSG_ERROR(Cannot find libiiapi.a under $II_DIR/lib) fi - PHP_ADD_LIBRARY_WITH_PATH(iiapi, $II_LIB_DIR, II_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(ingres, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(iiapi.1, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(q.1, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(frame.1, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(compat.1, $II_LIB_DIR, II_SHARED_LIBADD) PHP_ADD_INCLUDE($II_INC_DIR) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
