[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Sep 10 01:31:18 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2803r2=1.2804diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2803 php-src/ChangeLog:1.2804 --- php-src/ChangeLog:1.2803Sun Sep 9 01:31:14 2007 +++ php-src/ChangeLog Mon Sep 10 01:31:18 2007 @@ -1,3 +1,72 @@ +2007-09-09 Antony Dovgal [EMAIL PROTECTED] + +* ZendEngine2/zend_language_scanner.l: + use macros + +* ext/standard/tests/strings/addcslashes.phpt: + remove the original + +* ext/standard/tests/strings/addcslashes_001.phpt + ext/standard/tests/strings/addcslashes_002.phpt + ext/standard/tests/strings/addcslashes_003.phpt + ext/standard/tests/strings/addcslashes_004.phpt: + MFB: split test + +* ZendEngine2/zend_language_scanner.l: + unicode part of \v and \t patch + +* (PHP_5_2) + ext/standard/tests/strings/addcslashes.phpt + ext/standard/tests/strings/addcslashes_001.phpt + ext/standard/tests/strings/addcslashes_001.phpt + ext/standard/tests/strings/addcslashes_002.phpt + ext/standard/tests/strings/addcslashes_002.phpt + ext/standard/tests/strings/addcslashes_003.phpt + ext/standard/tests/strings/addcslashes_003.phpt + ext/standard/tests/strings/addcslashes_004.phpt + ext/standard/tests/strings/addcslashes_004.phpt: + split one more ten-in-one test + and fix \v\f stuff while we're here.. + +2007-09-09 Ilia Alshanetsky [EMAIL PROTECTED] + +* ZendEngine2/zend_language_scanner.l: + + MFB: Fixed bug #42590 (Make the engine recornize \v and \f escape + sequences) + +* (PHP_5_2) + NEWS: + BFN + +* (PHP_5_2) + ZendEngine2/zend_language_scanner.l: + Fixed bug #42590 (Make the engine recornize \v and \f escape sequences) + +2007-09-09 Scott MacVicar [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +* (PHP_5_2) + ext/mysql/php_mysql.c: + MFH: Fixed bug 42549 (ext/mysql failed to compile with libmysql 3.23) + +* ext/mysql/php_mysql.c: + Fixed bug 42549 (ext/mysql failed to compile with libmysql 3.23) + +2007-09-09 Pierre-Alain Joye [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + - #106 entry + +* (PHP_5_2) + ext/gd/libgd/gd.c: + - re-add fix for libgd #106, imagerectangle draws 1x1 rectangles +as 1x3 rectangles + 2007-09-08 Antony Dovgal [EMAIL PROTECTED] * sapi/cgi/cgi_main.c:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Sep 10 01:31:23 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1166r2=1.1167diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1166 ZendEngine2/ChangeLog:1.1167 --- ZendEngine2/ChangeLog:1.1166Sat Sep 8 01:31:19 2007 +++ ZendEngine2/ChangeLog Mon Sep 10 01:31:22 2007 @@ -1,3 +1,22 @@ +2007-09-09 Antony Dovgal [EMAIL PROTECTED] + +* zend_language_scanner.l: + use macros + +* zend_language_scanner.l: + unicode part of \v and \t patch + +2007-09-09 Ilia Alshanetsky [EMAIL PROTECTED] + +* zend_language_scanner.l: + + MFB: Fixed bug #42590 (Make the engine recornize \v and \f escape + sequences) + +* (PHP_5_2) + zend_language_scanner.l: + Fixed bug #42590 (Make the engine recornize \v and \f escape sequences) + 2007-09-07 Jani Taskinen [EMAIL PROTECTED] * zend_ini.c @@ -18904,7 +18923,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1166 2007/09/08 01:31:19 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1167 2007/09/10 01:31:22 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -20628,7 +20647,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1166 2007/09/08 01:31:19 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1167 2007/09/10 01:31:22 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd/libgd gd.c
pajoye Sun Sep 9 13:05:52 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gd/libgd gd.c
Log:
- re-add fix for libgd #106, imagerectangle draws 1x1 rectangles
as 1x3 rectangles
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.19r2=1.90.2.1.2.20diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.19
php-src/ext/gd/libgd/gd.c:1.90.2.1.2.20
--- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.19 Mon Aug 27 08:27:45 2007
+++ php-src/ext/gd/libgd/gd.c Sun Sep 9 13:05:51 2007
@@ -2124,6 +2124,11 @@
int half1 = 1;
int t;
+ if (x1 == x2 y1 == y2 thick == 1) {
+ gdImageSetPixel(im, x1, y1, color);
+ return;
+ }
+
if (y2 y1) {
t=y1;
y1 = y2;
--
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) / NEWS
pajoye Sun Sep 9 13:07:00 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - #106 entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.935r2=1.2027.2.547.2.936diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.935 php-src/NEWS:1.2027.2.547.2.936 --- php-src/NEWS:1.2027.2.547.2.935 Fri Sep 7 09:39:11 2007 +++ php-src/NEWSSun Sep 9 13:07:00 2007 @@ -7,6 +7,7 @@ - Fixed possible triggering of buffer overflows inside glibc imlplementations of the fnmatch(), setlocale() and glob() functions reported by Laurent gaffie (Ilia) +- Fixed imagerectangle regression with 1x1 rectangle (libgd #106). (Pierre) - Upgraded PCRE to version 7.3 (Nuno) - Added optional parameter $provide_object to debug_backtrace(). (Sebastian) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c
scottmacSun Sep 9 16:07:45 2007 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
Log:
Fixed bug 42549 (ext/mysql failed to compile with libmysql 3.23)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.240r2=1.241diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.240 php-src/ext/mysql/php_mysql.c:1.241
--- php-src/ext/mysql/php_mysql.c:1.240 Mon Aug 6 15:11:46 2007
+++ php-src/ext/mysql/php_mysql.c Sun Sep 9 16:07:45 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.240 2007/08/06 15:11:46 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.241 2007/09/09 16:07:45 scottmac Exp $ */
/* TODO:
*
@@ -447,9 +447,11 @@
REGISTER_LONG_CONSTANT(MYSQL_CLIENT_IGNORE_SPACE,
CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT);
#ifndef HAVE_MYSQLND
+#if MYSQL_VERSION_ID = 4
if (mysql_server_init(0, NULL, NULL)) {
return FAILURE;
}
+#endif
#else
mysql_mysqlnd_zval_cache = mysqlnd_palloc_init_cache(MySG(cache_size));
mysql_mysqlnd_qcache = mysqlnd_qcache_init_cache();
@@ -464,8 +466,9 @@
PHP_MSHUTDOWN_FUNCTION(mysql)
{
#ifndef HAVE_MYSQLND
+#if MYSQL_VERSION_ID = 4
#ifdef PHP_WIN32
- unsigned long client_ver = mysql_get_client_version;
+ unsigned long client_ver = mysql_get_client_version();
/* Can't call mysql_server_end() multiple times prior to 5.0.42 on
Windows */
if ((client_ver 50042 client_ver 50100) || client_ver 50122) {
mysql_server_end();
@@ -473,6 +476,7 @@
#else
mysql_server_end();
#endif
+#endif
#else
mysqlnd_palloc_free_cache(mysql_mysqlnd_zval_cache);
mysqlnd_qcache_free_cache_reference(mysql_mysqlnd_qcache);
@@ -487,7 +491,7 @@
*/
PHP_RINIT_FUNCTION(mysql)
{
-#if !defined(HAVE_MYSQLND) defined(ZTS)
+#if !defined(HAVE_MYSQLND) defined(ZTS) MYSQL_VERSION_ID = 4
if (mysql_thread_init()) {
return FAILURE;
}
@@ -511,7 +515,7 @@
*/
PHP_RSHUTDOWN_FUNCTION(mysql)
{
-#if !defined(HAVE_MYSQLND) defined(ZTS)
+#if !defined(HAVE_MYSQLND) defined(ZTS) MYSQL_VERSION_ID = 4
mysql_thread_end();
#endif
--
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/mysql php_mysql.c
scottmacSun Sep 9 16:08:17 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysql php_mysql.c
Log:
MFH: Fixed bug 42549 (ext/mysql failed to compile with libmysql 3.23)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.15r2=1.213.2.6.2.16diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.15
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.15Mon Jun 25 16:01:30 2007
+++ php-src/ext/mysql/php_mysql.c Sun Sep 9 16:08:17 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.15 2007/06/25 16:01:30 scottmac Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16 2007/09/09 16:08:17 scottmac Exp $ */
/* TODO:
*
@@ -401,9 +401,11 @@
REGISTER_LONG_CONSTANT(MYSQL_CLIENT_INTERACTIVE, CLIENT_INTERACTIVE,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQL_CLIENT_IGNORE_SPACE,
CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT);
+#if MYSQL_VERSION_ID = 4
if (mysql_server_init(0, NULL, NULL)) {
return FAILURE;
}
+#endif
return SUCCESS;
}
@@ -413,8 +415,9 @@
*/
PHP_MSHUTDOWN_FUNCTION(mysql)
{
+#if MYSQL_VERSION_ID = 4
#ifdef PHP_WIN32
- unsigned long client_ver = mysql_get_client_version;
+ unsigned long client_ver = mysql_get_client_version();
/* Can't call mysql_server_end() multiple times prior to 5.0.42 on
Windows */
if ((client_ver 50042 client_ver 50100) || client_ver 50122) {
mysql_server_end();
@@ -422,6 +425,7 @@
#else
mysql_server_end();
#endif
+#endif
UNREGISTER_INI_ENTRIES();
return SUCCESS;
@@ -432,7 +436,7 @@
*/
PHP_RINIT_FUNCTION(mysql)
{
-#ifdef ZTS
+#if defined(ZTS) MYSQL_VERSION_ID = 4
if (mysql_thread_init()) {
return FAILURE;
}
@@ -452,7 +456,7 @@
*/
PHP_RSHUTDOWN_FUNCTION(mysql)
{
-#ifdef ZTS
+#if defined(ZTS) MYSQL_VERSION_ID = 4
mysql_thread_end();
#endif
--
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) / NEWS
scottmacSun Sep 9 16:12:09 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
Log:
BFN
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.936r2=1.2027.2.547.2.937diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.936 php-src/NEWS:1.2027.2.547.2.937
--- php-src/NEWS:1.2027.2.547.2.936 Sun Sep 9 13:07:00 2007
+++ php-src/NEWSSun Sep 9 16:12:09 2007
@@ -13,6 +13,7 @@
- Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
- Fixed bug #42579 (apache_reset_timeout() does not exist). (Jani)
+- Fixed bug #42549 (ext/mysql failed to compile with libmysql 3.23). (Scott)
- Fixed bug #42523 (PHP_SELF duplicates path). (Dmitry)
- Fixed bug #42512 (ip2long('255.255.255.255') should return 4294967295 on
64-bit PHP). (Derick)
--
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) / NEWS
iliaa Sun Sep 9 16:34:05 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.937r2=1.2027.2.547.2.938diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.937 php-src/NEWS:1.2027.2.547.2.938 --- php-src/NEWS:1.2027.2.547.2.937 Sun Sep 9 16:12:09 2007 +++ php-src/NEWSSun Sep 9 16:34:05 2007 @@ -12,6 +12,8 @@ - Upgraded PCRE to version 7.3 (Nuno) - Added optional parameter $provide_object to debug_backtrace(). (Sebastian) +- Fixed bug #42590 (Make the engine recornize \v and \f escape sequences). + (Ilia) - Fixed bug #42579 (apache_reset_timeout() does not exist). (Jani) - Fixed bug #42549 (ext/mysql failed to compile with libmysql 3.23). (Scott) - Fixed bug #42523 (PHP_SELF duplicates path). (Dmitry) -- 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/tests/strings addcslashes.phpt addcslashes_001.phpt addcslashes_002.phpt addcslashes_003.phpt addcslashes_004.phpt
tony2001Sun Sep 9 22:28:07 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings addcslashes_001.phpt addcslashes_002.phpt addcslashes_003.phpt addcslashes_004.phpt Removed files: /php-src/ext/standard/tests/strings addcslashes.phpt Log: split one more ten-in-one test and fix \v\f stuff while we're here.. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addcslashes_001.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/addcslashes_001.phpt +++ php-src/ext/standard/tests/strings/addcslashes_001.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addcslashes_002.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/addcslashes_002.phpt +++ php-src/ext/standard/tests/strings/addcslashes_002.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addcslashes_003.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/addcslashes_003.phpt +++ php-src/ext/standard/tests/strings/addcslashes_003.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addcslashes_004.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/addcslashes_004.phpt +++ php-src/ext/standard/tests/strings/addcslashes_004.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/tests/strings addcslashes_001.phpt addcslashes_002.phpt addcslashes_003.phpt addcslashes_004.phpt
tony2001Sun Sep 9 22:47:24 2007 UTC
Modified files:
/php-src/ext/standard/tests/strings addcslashes_001.phpt
addcslashes_002.phpt
addcslashes_003.phpt
addcslashes_004.phpt
Log:
MFB: split test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addcslashes_001.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/addcslashes_001.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addcslashes_002.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/addcslashes_002.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/addcslashes_002.phpt:1.2
--- /dev/null Sun Sep 9 22:47:24 2007
+++ php-src/ext/standard/tests/strings/addcslashes_002.phpt Sun Sep 9
22:47:23 2007
@@ -0,0 +1,33 @@
+--TEST--
+Test addcslashes() function (variation 2)
+--INI--
+precision=14
+--FILE--
+?php
+
+$string = bgoodyear12345NULL\0truefalse\a\v\f\b\n\r\t;
+/* charlist \0..\37 would escape all characters with ASCII code between 0
and 31 */
+echo \n*** Testing addcslashes() with ASCII code between 0 and 31 ***\n;
+var_dump( addcslashes($string, b\0..\37) );
+
+/* Checking OBJECTS type */
+echo \n*** Testing addcslashes() with objects ***\n;
+class string1
+{
+ public function __toString() {
+return Object;
+ }
+}
+$obj = new string1;
+var_dump( addcslashes((binary)$obj, bb) );
+
+echo Done\n;
+
+?
+--EXPECTF--
+*** Testing addcslashes() with ASCII code between 0 and 31 ***
+string(44) goodyear12345NULL\000truefalse\a\v\f\b\n\r\t
+
+*** Testing addcslashes() with objects ***
+string(7) O\bject
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addcslashes_003.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/addcslashes_003.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addcslashes_004.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/addcslashes_004.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/addcslashes_004.phpt:1.2
--- /dev/null Sun Sep 9 22:47:24 2007
+++ php-src/ext/standard/tests/strings/addcslashes_004.phpt Sun Sep 9
22:47:23 2007
@@ -0,0 +1,47 @@
+--TEST--
+Test addcslashes() function (errors)
+--INI--
+precision=14
+--FILE--
+?php
+
+echo \n*** Testing error conditions ***\n;
+/* zero argument */
+var_dump( addcslashes() );
+
+/* unexpected arguments */
+var_dump( addcslashes(bfoo[]) );
+var_dump( addcslashes(foo, foo) );
+var_dump( addcslashes(b'foo[]', bo, bfoo) );
+
+echo Done\n;
+
+?
+--EXPECTF--
+*** Testing error conditions ***
+
+Warning: addcslashes() expects exactly 2 parameters, 0 given in %s on line %d
+NULL
+
+Warning: addcslashes() expects exactly 2 parameters, 1 given in %s on line %d
+NULL
+string(6) \f\o\o
+
+Warning: addcslashes() expects exactly 2 parameters, 3 given in %s on line %d
+NULL
+Done
+--UEXPECTF--
+*** Testing error conditions ***
+
+Warning: addcslashes() expects exactly 2 parameters, 0 given in %s on line %d
+NULL
+
+Warning: addcslashes() expects exactly 2 parameters, 1 given in %s on line %d
+NULL
+
+Warning: addcslashes() expects parameter 1 to be strictly a binary string,
Unicode string given in %s on line %d
+NULL
+
+Warning: addcslashes() expects exactly 2 parameters, 3 given in %s on line %d
+NULL
+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/tests/strings addcslashes.phpt
tony2001Sun Sep 9 22:47:47 2007 UTC Removed files: /php-src/ext/standard/tests/strings addcslashes.phpt Log: remove the original -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
