[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zlib/tests compress_zlib_wrapper.phpt
dmitry Mon Jun 18 10:02:13 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/zlib/tests compress_zlib_wrapper.phpt Log: Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/compress_zlib_wrapper.phpt?r1=1.2.2.2&r2=1.2.2.2.2.1&diff_format=u Index: php-src/ext/zlib/tests/compress_zlib_wrapper.phpt diff -u php-src/ext/zlib/tests/compress_zlib_wrapper.phpt:1.2.2.2 php-src/ext/zlib/tests/compress_zlib_wrapper.phpt:1.2.2.2.2.1 --- php-src/ext/zlib/tests/compress_zlib_wrapper.phpt:1.2.2.2 Sun Dec 25 22:38:14 2005 +++ php-src/ext/zlib/tests/compress_zlib_wrapper.phpt Mon Jun 18 10:02:12 2007 @@ -4,6 +4,7 @@ --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib/tests compress_zlib_wrapper.phpt
dmitry Mon Jun 18 10:01:42 2007 UTC Modified files: /php-src/ext/zlib/tests compress_zlib_wrapper.phpt Log: Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/compress_zlib_wrapper.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/zlib/tests/compress_zlib_wrapper.phpt diff -u php-src/ext/zlib/tests/compress_zlib_wrapper.phpt:1.4 php-src/ext/zlib/tests/compress_zlib_wrapper.phpt:1.5 --- php-src/ext/zlib/tests/compress_zlib_wrapper.phpt:1.4 Sun Dec 25 22:38:36 2005 +++ php-src/ext/zlib/tests/compress_zlib_wrapper.phpt Mon Jun 18 10:01:42 2007 @@ -4,6 +4,7 @@ --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
sniper Mon Jun 18 22:35:30 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: rephrase http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.790&r2=1.2027.2.547.2.791&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.790 php-src/NEWS:1.2027.2.547.2.791 --- php-src/NEWS:1.2027.2.547.2.790 Mon Jun 18 22:06:33 2007 +++ php-src/NEWSMon Jun 18 22:35:30 2007 @@ -28,8 +28,8 @@ - Fixed money_format() not to accept multiple %i or %n tokens. (Stas, Ilia) - Fixed zend_alter_ini_entry() memory_limit interruption vulnerability. (Ilia) -- Fixed INFILE LOCAL option handling with MySQL - now not allowed when - open_basedir or safe_mode is active (Stas) +- Fixed INFILE LOCAL option handling with MySQL extensions not to be allowed + when open_basedir or safe_mode is active. (Stas) - Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory already exists). (Pierre) -- 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
stasMon Jun 18 22:06:33 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: mysql fix http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.789&r2=1.2027.2.547.2.790&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.789 php-src/NEWS:1.2027.2.547.2.790 --- php-src/NEWS:1.2027.2.547.2.789 Mon Jun 18 16:55:36 2007 +++ php-src/NEWSMon Jun 18 22:06:33 2007 @@ -28,6 +28,8 @@ - Fixed money_format() not to accept multiple %i or %n tokens. (Stas, Ilia) - Fixed zend_alter_ini_entry() memory_limit interruption vulnerability. (Ilia) +- Fixed INFILE LOCAL option handling with MySQL - now not allowed when + open_basedir or safe_mode is active (Stas) - Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory already exists). (Pierre) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS
stasMon Jun 18 22:03:32 2007 UTC Modified files: (Branch: PHP_4_4) /php-srcNEWS Log: mysql fix http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.238&r2=1.1247.2.920.2.239&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.238 php-src/NEWS:1.1247.2.920.2.239 --- php-src/NEWS:1.1247.2.920.2.238 Mon Jun 18 15:53:15 2007 +++ php-src/NEWSMon Jun 18 22:03:32 2007 @@ -8,6 +8,8 @@ - Fixed money_format() not to accept multiple %i or %n tokens. (Stas, Ilia) - Addded "max_input_nesting_level" php.ini option to limit nesting level of input variables. Fix for MOPB-03-2007. (Stas) +- Fixed INFILE LOCAL option handling with MySQL - now not allowed when + open_basedir or safe_mode is active (Stas) - Fixed bug #41630 (segfault when an invalid color index is present in the image data). (Reported by Elliot <[EMAIL PROTECTED] dot com>) (Pierre) - Fixed bug #41628 (PHP settings leak between Virtual Hosts in -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mysql php_mysql.c
stasMon Jun 18 22:01:56 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/mysql php_mysql.c
Log:
Fix INFILE LOCAL option handling with MySQL - now not allowed when safe_mode
is active
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.174.2.29.2.4&r2=1.174.2.29.2.5&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.174.2.29.2.4
php-src/ext/mysql/php_mysql.c:1.174.2.29.2.5
--- php-src/ext/mysql/php_mysql.c:1.174.2.29.2.4Thu Jun 7 12:17:53 2007
+++ php-src/ext/mysql/php_mysql.c Mon Jun 18 22:01:56 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.174.2.29.2.4 2007/06/07 12:17:53 tony2001 Exp $ */
+/* $Id: php_mysql.c,v 1.174.2.29.2.5 2007/06/18 22:01:56 stas Exp $ */
/* TODO:
*
@@ -595,8 +595,8 @@
WRONG_PARAM_COUNT;
break;
}
- /* disable local infile option for open_basedir */
- if (PG(open_basedir) && strlen(PG(open_basedir)) &&
(client_flags & CLIENT_LOCAL_FILES)) {
+ /* disable local infile option for open_basedir and safe_mode */
+ if (((PG(open_basedir) && PG(open_basedir)[0] != '\0') ||
PG(safe_mode)) && (client_flags & CLIENT_LOCAL_FILES)) {
client_flags ^= CLIENT_LOCAL_FILES;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c /ext/pdo_mysql mysql_driver.c
stasMon Jun 18 21:59:05 2007 UTC
Modified files:
/php-src/ext/mysqli mysqli_api.c
/php-src/ext/pdo_mysql mysql_driver.c
Log:
Fix INFILE LOCAL option handling with MySQL - now not allowed when
open_basedir
is active
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.146&r2=1.147&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.146
php-src/ext/mysqli/mysqli_api.c:1.147
--- php-src/ext/mysqli/mysqli_api.c:1.146 Sat Apr 14 10:42:41 2007
+++ php-src/ext/mysqli/mysqli_api.c Mon Jun 18 21:59:05 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_api.c,v 1.146 2007/04/14 10:42:41 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.147 2007/06/18 21:59:05 stas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1320,6 +1320,12 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
+ if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {
+ if(mysql_option == MYSQL_OPT_LOCAL_INFILE) {
+ RETURN_FALSE;
+ }
+ }
+
switch (Z_TYPE_PP(&mysql_value)) {
case IS_UNICODE:
zval_unicode_to_string(mysql_value TSRMLS_CC);
@@ -1453,9 +1459,9 @@
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
/* remove some insecure options */
- flags ^= CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via
connect parameter */
- if (PG(open_basedir) && strlen(PG(open_basedir))) {
- flags ^= CLIENT_LOCAL_FILES;
+ flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via
connect parameter */
+ if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {
+ flags &= ~CLIENT_LOCAL_FILES;
}
if (!socket) {
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.77&r2=1.78&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.77
php-src/ext/pdo_mysql/mysql_driver.c:1.78
--- php-src/ext/pdo_mysql/mysql_driver.c:1.77 Mon Jan 1 09:29:28 2007
+++ php-src/ext/pdo_mysql/mysql_driver.cMon Jun 18 21:59:05 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mysql_driver.c,v 1.77 2007/01/01 09:29:28 sebastian Exp $ */
+/* $Id: mysql_driver.c,v 1.78 2007/06/18 21:59:05 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -476,6 +476,10 @@
H->emulate_prepare = pdo_attr_lval(driver_options,
PDO_MYSQL_ATTR_DIRECT_QUERY, 1 TSRMLS_CC);
H->max_buffer_size = pdo_attr_lval(driver_options,
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, H->max_buffer_size TSRMLS_CC);
+ if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {
+ local_infile = 0;
+ }
+
if (mysql_options(H->server, MYSQL_OPT_CONNECT_TIMEOUT, (const
char *)&connect_timeout)) {
pdo_mysql_error(dbh);
goto cleanup;
--
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 /ext/mysqli mysqli_api.c /ext/pdo_mysql mysql_driver.c
stasMon Jun 18 21:51:32 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_api.c
/php-src/ext/pdo_mysql mysql_driver.c
Log:
Fix INFILE LOCAL option handling with MySQL - now not allowed when
open_basedir
or safe_mode is active
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.13&r2=1.213.2.6.2.14&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.13
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.14
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.13Thu Jun 7 12:17:35 2007
+++ php-src/ext/mysql/php_mysql.c Mon Jun 18 21:51:32 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.13 2007/06/07 12:17:35 tony2001 Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.14 2007/06/18 21:51:32 stas Exp $ */
/* TODO:
*
@@ -603,7 +603,7 @@
break;
}
/* disable local infile option for open_basedir */
-if (PG(open_basedir) && strlen(PG(open_basedir)) &&
(client_flags & CLIENT_LOCAL_FILES)) {
+ if (((PG(open_basedir) && PG(open_basedir)[0] != '\0') ||
PG(safe_mode)) && (client_flags & CLIENT_LOCAL_FILES)) {
client_flags ^= CLIENT_LOCAL_FILES;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.11&r2=1.118.2.22.2.12&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.11
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.12
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.11 Thu Mar 8 22:49:53 2007
+++ php-src/ext/mysqli/mysqli_api.c Mon Jun 18 21:51:32 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.11 2007/03/08 22:49:53 stas Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.12 2007/06/18 21:51:32 stas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1289,6 +1289,12 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
+ if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') || PG(safe_mode))
{
+ if(mysql_option == MYSQL_OPT_LOCAL_INFILE) {
+ RETURN_FALSE;
+ }
+ }
+
switch (Z_TYPE_PP(&mysql_value)) {
case IS_STRING:
ret = mysql_options(mysql->mysql, mysql_option,
Z_STRVAL_PP(&mysql_value));
@@ -1427,9 +1433,9 @@
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
/* remove some insecure options */
- flags ^= CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via
connect parameter */
- if (PG(open_basedir) && strlen(PG(open_basedir))) {
- flags ^= CLIENT_LOCAL_FILES;
+ flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via
connect parameter */
+ if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') || PG(safe_mode))
{
+ flags &= ~CLIENT_LOCAL_FILES;
}
if (!socket) {
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.13.2.4&r2=1.59.2.13.2.5&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.4
php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.5
--- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.4 Mon Jan 1 09:36:05 2007
+++ php-src/ext/pdo_mysql/mysql_driver.cMon Jun 18 21:51:32 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mysql_driver.c,v 1.59.2.13.2.4 2007/01/01 09:36:05 sebastian Exp $ */
+/* $Id: mysql_driver.c,v 1.59.2.13.2.5 2007/06/18 21:51:32 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -492,7 +492,11 @@
pdo_mysql_error(dbh);
goto cleanup;
}
-
+
+ if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') ||
PG(safe_mode)) {
+ local_infile = 0;
+ }
+
if (mysql_options(H->server, MYSQL_OPT_LOCAL_INFILE, (const
char *)&local_infile)) {
pdo_mysql_error(dbh);
goto cleanup;
--
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/file filesize_basic.phpt filesize_error.phpt fread_basic.phpt fread_error.phpt is_dir_basic.phpt is_dir_error.phpt is_file_basic.phpt is_file_error.phpt
kraghubaMon Jun 18 19:51:11 2007 UTC
Modified files:
/php-src/ext/standard/tests/fileis_dir_error.phpt fread_error.phpt
is_file_basic.phpt
filesize_basic.phpt
filesize_error.phpt
is_file_error.phpt
fread_basic.phpt is_dir_basic.phpt
Log:
New tests for file system handling functions
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_dir_error.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/file/is_dir_error.phpt
diff -u /dev/null php-src/ext/standard/tests/file/is_dir_error.phpt:1.2
--- /dev/null Mon Jun 18 19:51:11 2007
+++ php-src/ext/standard/tests/file/is_dir_error.phpt Mon Jun 18 19:51:11 2007
@@ -0,0 +1,44 @@
+--TEST--
+Test is_dir() function: error conditions
+--FILE--
+ expected no.of args
+
+/* Non-existing dir */
+var_dump( is_dir("/no/such/dir") );
+
+echo "*** Done ***";
+?>
+
+--CLEAN--
+
+--EXPECTF--
+*** Testing is_dir() error conditions ***
+Warning: is_dir() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: is_dir() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+bool(false)
+*** Done ***
+--UEXPECTF--
+*** Testing is_dir() error conditions ***
+Warning: is_dir() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: is_dir() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+bool(false)
+*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_error.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/file/fread_error.phpt
diff -u /dev/null php-src/ext/standard/tests/file/fread_error.phpt:1.2
--- /dev/null Mon Jun 18 19:51:11 2007
+++ php-src/ext/standard/tests/file/fread_error.phptMon Jun 18 19:51:11 2007
@@ -0,0 +1,169 @@
+--TEST--
+Test fread() function : error conditions
+--FILE--
+http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_basic.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/file/is_file_basic.phpt
diff -u /dev/null php-src/ext/standard/tests/file/is_file_basic.phpt:1.2
--- /dev/null Mon Jun 18 19:51:11 2007
+++ php-src/ext/standard/tests/file/is_file_basic.phpt Mon Jun 18 19:51:11 2007
@@ -0,0 +1,59 @@
+--TEST--
+Test is_file() function: basic functionality
+--FILE--
+
+--CLEAN--
+
+--EXPECTF--
+*** Testing is_file(): basic functionality ***
+bool(true)
+bool(false)
+bool(false)
+bool(true)
+*** Testing is_file() for its return value type ***
+bool(true)
+bool(true)
+
+*** Done ***
+--UEXPECTF--
+*** Testing is_file(): basic functionality ***
+bool(true)
+bool(false)
+bool(false)
+bool(true)
+*** Testing is_file() for its return value type ***
+bool(true)
+bool(true)
+
+*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_basic.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/file/filesize_basic.phpt
diff -u /dev/null php-src/ext/standard/tests/file/filesize_basic.phpt:1.2
--- /dev/null Mon Jun 18 19:51:11 2007
+++ php-src/ext/standard/tests/file/filesize_basic.phpt Mon Jun 18 19:51:11 2007
@@ -0,0 +1,45 @@
+--TEST--
+Test filesize() function: basic functionaity
+--FILE--
+
+--CLEAN--
+
+--EXPECTF--
+*** Testing size of files and directories with filesize() ***
+int(%d)
+int(%d)
+int(0)
+*** Done ***
+
+--UEXPECTF--
+*** Testing size of files and directories with filesize() ***
+int(%d)
+int(%d)
+int(0)
+*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_error.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/file/filesize_error.phpt
diff -u /dev/null php-src/ext/standard/tests/file/filesize_error.phpt:1.2
--- /dev/null Mon Jun 18 19:51:11 2007
+++ php-src/ext/standard/tests/file/filesize_error.phpt Mon Jun 18 19:51:11 2007
@@ -0,0 +1,56 @@
+--TEST--
+Test filesize() function: error conditions
+--FILE--
+
+--EXPECTF--
+*** Testing filesize(): error conditions ***
+Warning: filesize(): stat failed for /no/such/file in %s on line %d
+bool(false)
+
+Warning: filesize(): stat failed for /no/such/dir in %s on line %d
+bool(false)
+
+Warning: filesize() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: filesize() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+
+*** Done ***
+
+--UEXPECTF--
+*** Testing filesize(): error conditions ***
+Warning: filesize(): stat failed for /no/such/file in %s on line %d
+bool(false)
+
+Warning: filesize(): stat failed for /no/such/dir in %s on line %d
+bool(false)
+
+Warning: filesize() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: filesize() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+
+*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_error.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/s
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file filesize_basic.phpt filesize_error.phpt fread_basic.phpt fread_error.phpt is_dir_basic.phpt is_dir_error.phpt is_file_basic.phpt is_file_error.
kraghubaMon Jun 18 19:45:53 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/fileis_file_basic.phpt filesize_basic.phpt fread_error.phpt is_dir_basic.phpt is_dir_error.phpt filesize_error.phpt fread_basic.phpt is_file_error.phpt Log: New tests for file system handling functions http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/is_file_basic.phpt +++ php-src/ext/standard/tests/file/is_file_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filesize_basic.phpt +++ php-src/ext/standard/tests/file/filesize_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fread_error.phpt +++ php-src/ext/standard/tests/file/fread_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_dir_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/is_dir_basic.phpt +++ php-src/ext/standard/tests/file/is_dir_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_dir_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/is_dir_error.phpt +++ php-src/ext/standard/tests/file/is_dir_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/filesize_error.phpt +++ php-src/ext/standard/tests/file/filesize_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_basic.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/fread_basic.phpt +++ php-src/ext/standard/tests/file/fread_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/is_file_error.phpt +++ php-src/ext/standard/tests/file/is_file_error.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) / NEWS
sniper Mon Jun 18 16:55:37 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: rephrase http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.788&r2=1.2027.2.547.2.789&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.788 php-src/NEWS:1.2027.2.547.2.789 --- php-src/NEWS:1.2027.2.547.2.788 Mon Jun 18 16:53:09 2007 +++ php-src/NEWSMon Jun 18 16:55:36 2007 @@ -2,13 +2,14 @@ ||| ?? ??? 2007, PHP 5.2.4 - Upgraded PCRE to version 7.2 (Nuno) -- HTTP 500 is sent to browser in case of PHP error instead of blank page. - (Dmitry, Andrei Nigmatulin) - Improved fix for MOPB-03-2007. (Ilia) - Corrected fix for CVE-2007-2872. (Ilia) -- Enabled statement cache for non-persistent OCI8 connections. +- Enabled statement cache for non-persistent OCI8 connections. (Chris Jones, Tony) +- Changed error handler to send HTTP 500 instead of blank page on PHP errors. + (Dmitry, Andrei Nigmatulin) + - Added php_ini_loaded_file() function which returns the path to the actual php.ini in use. (Jani) - Added GD version constants GD_MAJOR_VERSION, GD_MINOR_VERSION -- 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 /ext/standard array.c /ext/standard/tests/array bug41686.phpt
iliaa Mon Jun 18 16:53:10 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array bug41686.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fixed bug #41686 (Omitting length param in array_slice not possible).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.787&r2=1.2027.2.547.2.788&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.787 php-src/NEWS:1.2027.2.547.2.788
--- php-src/NEWS:1.2027.2.547.2.787 Mon Jun 18 16:46:21 2007
+++ php-src/NEWSMon Jun 18 16:53:09 2007
@@ -34,6 +34,8 @@
- Fixed bug #41724 (libxml_get_last_error() - errors survice request scope).
(thekid at php dot net, Ilia)
- Fixed bug #41717 (imagepolygon does not respect thickness). (Pierre)
+- Fixed bug #41686 (Omitting length param in array_slice not possible).
+ (Ilia)
- Fixed bug #41655 (open_basedir bypass via glob()). (Ilia)
- Fixed bug #41640 (get_class_vars produces error on class constants).
(Johannes)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.28&r2=1.308.2.21.2.29&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.28
php-src/ext/standard/array.c:1.308.2.21.2.29
--- php-src/ext/standard/array.c:1.308.2.21.2.28Tue Jun 5 12:12:55 2007
+++ php-src/ext/standard/array.cMon Jun 18 16:53:09 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.28 2007/06/05 12:12:55 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.29 2007/06/18 16:53:09 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2213,7 +2213,7 @@
is not passed */
convert_to_long_ex(offset);
offset_val = Z_LVAL_PP(offset);
- if (argc >= 3) {
+ if (argc >= 3 && Z_TYPE_PP(length) != IS_NULL) {
convert_to_long_ex(length);
length_val = Z_LVAL_PP(length);
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug41686.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/array/bug41686.phpt
+++ php-src/ext/standard/tests/array/bug41686.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
iliaa Mon Jun 18 16:46:40 2007 UTC Modified files: /php-src/ext/libxml libxml.c Log: MFB: Fixed bug #41724 (libxml_get_last_error() - errors survice request scope). http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.58&r2=1.59&diff_format=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.58 php-src/ext/libxml/libxml.c:1.59 --- php-src/ext/libxml/libxml.c:1.58Fri Feb 23 11:13:42 2007 +++ php-src/ext/libxml/libxml.c Mon Jun 18 16:46:40 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: libxml.c,v 1.58 2007/02/23 11:13:42 rrichards Exp $ */ +/* $Id: libxml.c,v 1.59 2007/06/18 16:46:40 iliaa Exp $ */ #define IS_EXT_MODULE @@ -674,6 +674,7 @@ efree(LIBXML(error_list)); LIBXML(error_list) = NULL; } + xmlResetLastError(); return SUCCESS; } -- 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 /ext/libxml libxml.c
iliaa Mon Jun 18 16:46:21 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/libxml libxml.c Log: Fixed bug #41724 (libxml_get_last_error() - errors survice request scope). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.786&r2=1.2027.2.547.2.787&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.786 php-src/NEWS:1.2027.2.547.2.787 --- php-src/NEWS:1.2027.2.547.2.786 Mon Jun 18 15:52:46 2007 +++ php-src/NEWSMon Jun 18 16:46:21 2007 @@ -31,6 +31,8 @@ - Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory already exists). (Pierre) +- Fixed bug #41724 (libxml_get_last_error() - errors survice request scope). + (thekid at php dot net, Ilia) - Fixed bug #41717 (imagepolygon does not respect thickness). (Pierre) - Fixed bug #41655 (open_basedir bypass via glob()). (Ilia) - Fixed bug #41640 (get_class_vars produces error on class constants). http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.11&r2=1.32.2.7.2.12&diff_format=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.11 php-src/ext/libxml/libxml.c:1.32.2.7.2.12 --- php-src/ext/libxml/libxml.c:1.32.2.7.2.11 Fri Feb 23 11:12:49 2007 +++ php-src/ext/libxml/libxml.c Mon Jun 18 16:46:21 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: libxml.c,v 1.32.2.7.2.11 2007/02/23 11:12:49 rrichards Exp $ */ +/* $Id: libxml.c,v 1.32.2.7.2.12 2007/06/18 16:46:21 iliaa Exp $ */ #define IS_EXT_MODULE @@ -674,6 +674,7 @@ efree(LIBXML(error_list)); LIBXML(error_list) = NULL; } + xmlResetLastError(); return SUCCESS; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache mod_php.c
scottmacMon Jun 18 15:57:00 2007 UTC
Modified files:
/php-src/sapi/apachemod_php.c
Log:
MFB: Fixed bug #41628 (PHP settings leak between Virtual Hosts in Apache 1.3).
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.2&r2=1.3&diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.2 php-src/sapi/apache/mod_php.c:1.3
--- php-src/sapi/apache/mod_php.c:1.2 Thu Jan 11 23:18:11 2007
+++ php-src/sapi/apache/mod_php.c Mon Jun 18 15:57:00 2007
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: mod_php.c,v 1.2 2007/01/11 23:18:11 andrei Exp $ */
+/* $Id: mod_php.c,v 1.3 2007/06/18 15:57:00 scottmac Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -749,9 +749,15 @@
*/
static void *php_merge_dir(pool *p, void *basev, void *addv)
{
- /* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev,
(copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry),
(merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
- return addv;
+ /* This function *must* not modify addv or basev */
+ HashTable *new;
+
+ /* need a copy of addv to merge */
+ new = php_create_dir(p, "php_merge_dir");
+ zend_hash_copy(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
+
+ zend_hash_merge_ex(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
+ return new;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /sapi/apache mod_php4.c
scottmacMon Jun 18 15:53:15 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/sapi/apachemod_php4.c
Log:
MFB: Fixed bug #41628 (PHP settings leak between Virtual Hosts in Apache 1.3).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.237&r2=1.1247.2.920.2.238&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.237 php-src/NEWS:1.1247.2.920.2.238
--- php-src/NEWS:1.1247.2.920.2.237 Tue Jun 12 12:56:17 2007
+++ php-src/NEWSMon Jun 18 15:53:15 2007
@@ -10,6 +10,8 @@
input variables. Fix for MOPB-03-2007. (Stas)
- Fixed bug #41630 (segfault when an invalid color index is present in
the image data). (Reported by Elliot <[EMAIL PROTECTED] dot com>) (Pierre)
+- Fixed bug #41628 (PHP settings leak between Virtual Hosts in
+ Apache 1.3). (Scott, manuel at mausz dot at)
- Fixed bug #38798 (OpenSSL init corrected in php5 but not in php4). (Tony)
04 May 2007, Version 4.4.7
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php4.c?r1=1.146.2.15.2.4&r2=1.146.2.15.2.5&diff_format=u
Index: php-src/sapi/apache/mod_php4.c
diff -u php-src/sapi/apache/mod_php4.c:1.146.2.15.2.4
php-src/sapi/apache/mod_php4.c:1.146.2.15.2.5
--- php-src/sapi/apache/mod_php4.c:1.146.2.15.2.4 Mon Jan 1 09:46:51 2007
+++ php-src/sapi/apache/mod_php4.c Mon Jun 18 15:53:15 2007
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: mod_php4.c,v 1.146.2.15.2.4 2007/01/01 09:46:51 sebastian Exp $ */
+/* $Id: mod_php4.c,v 1.146.2.15.2.5 2007/06/18 15:53:15 scottmac Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -728,9 +728,15 @@
*/
static void *php_merge_dir(pool *p, void *basev, void *addv)
{
- /* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev,
(copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool
(*)(void *, void *)) should_overwrite_per_dir_entry);
- return addv;
+ /* This function *must* not modify addv or basev */
+ HashTable *new;
+
+ /* need a copy of addv to merge */
+ new = php_create_dir(p, "php_merge_dir");
+ zend_hash_copy(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
+
+ zend_hash_merge_ex(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *))
should_overwrite_per_dir_entry);
+ return new;
}
/* }}} */
--
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 /sapi/apache mod_php5.c
scottmacMon Jun 18 15:52:46 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/sapi/apachemod_php5.c
Log:
Fixed bug #41628 (PHP settings leak between Virtual Hosts in Apache 1.3).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.785&r2=1.2027.2.547.2.786&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.785 php-src/NEWS:1.2027.2.547.2.786
--- php-src/NEWS:1.2027.2.547.2.785 Sun Jun 17 14:31:11 2007
+++ php-src/NEWSMon Jun 18 15:52:46 2007
@@ -39,6 +39,8 @@
constants). (Dmitry)
- Fixed bug #41630 (segfault when an invalid color index is present in
the image data). (Reported by Elliot <[EMAIL PROTECTED] dot com>) (Pierre)
+- Fixed bug #41628 (PHP settings leak between Virtual Hosts in
+ Apache 1.3). (Scott, manuel at mausz dot at)
- Fixed bug #41608 (segfault on a weird code with objects and switch()).
(Tony)
- Fixed bug #41600 (url rewriter tags doesn't work with namespaced tags).
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.9&r2=1.19.2.7.2.10&diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.19.2.7.2.9
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.10
--- php-src/sapi/apache/mod_php5.c:1.19.2.7.2.9 Mon Jan 1 09:36:12 2007
+++ php-src/sapi/apache/mod_php5.c Mon Jun 18 15:52:46 2007
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: mod_php5.c,v 1.19.2.7.2.9 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.10 2007/06/18 15:52:46 scottmac Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -764,9 +764,15 @@
*/
static void *php_merge_dir(pool *p, void *basev, void *addv)
{
- /* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev,
(copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry),
(merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
- return addv;
+ /* This function *must* not modify addv or basev */
+ HashTable *new;
+
+ /* need a copy of addv to merge */
+ new = php_create_dir(p, "php_merge_dir");
+ zend_hash_copy(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
+
+ zend_hash_merge_ex(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
+ return new;
}
/* }}} */
--
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
dmitry Mon Jun 18 13:54:59 2007 UTC
Modified files:
/php-src/ext/standard string.c
Log:
Fixed error message
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.644&r2=1.645&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.644 php-src/ext/standard/string.c:1.645
--- php-src/ext/standard/string.c:1.644 Mon Jun 18 13:39:02 2007
+++ php-src/ext/standard/string.c Mon Jun 18 13:54:59 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.644 2007/06/18 13:39:02 dmitry Exp $ */
+/* $Id: string.c,v 1.645 2007/06/18 13:54:59 dmitry Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -7894,7 +7894,7 @@
}
if(len > s1_len - offset) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length
cannot exceed initial string length");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The
specified segment exceeds string length");
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings bug40754.phpt
dmitry Mon Jun 18 13:39:02 2007 UTC
Modified files:
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings bug40754.phpt
Log:
Fixed crash in substr_compare()
Fixed error messages
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.643&r2=1.644&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.643 php-src/ext/standard/string.c:1.644
--- php-src/ext/standard/string.c:1.643 Mon Jun 18 11:50:41 2007
+++ php-src/ext/standard/string.c Mon Jun 18 13:39:02 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.643 2007/06/18 11:50:41 dmitry Exp $ */
+/* $Id: string.c,v 1.644 2007/06/18 13:39:02 dmitry Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -7208,7 +7208,7 @@
tmp = (char *)p + length;
}
if (tmp > endp) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Offset value %ld exceeds string length", offset);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Length value %ld exceeds string length", length);
RETURN_FALSE;
} else {
endp = tmp;
@@ -7888,8 +7888,13 @@
offset = (offset < 0) ? 0 : offset;
}
- if ((offset + len) > s1_len) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The
specified segment exceeds string length");
+ if(offset > s1_len) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The start
position cannot exceed initial string length");
+ RETURN_FALSE;
+ }
+
+ if(len > s1_len - offset) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length
cannot exceed initial string length");
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug40754.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/bug40754.phpt
diff -u php-src/ext/standard/tests/strings/bug40754.phpt:1.2
php-src/ext/standard/tests/strings/bug40754.phpt:1.3
--- php-src/ext/standard/tests/strings/bug40754.phpt:1.2Tue May 29
20:11:23 2007
+++ php-src/ext/standard/tests/strings/bug40754.phptMon Jun 18 13:39:02 2007
@@ -32,25 +32,25 @@
bool(false)
bool(false)
-Warning: substr_count(): Offset value 2147483647 exceeds string length. in %s
on line %d
+Warning: substr_count(): Offset value 2147483647 exceeds string length in %s
on line %d
bool(false)
Warning: substr_compare(): The start position cannot exceed initial string
length in %s on line %d
bool(false)
-Warning: stripos(): Offset not contained in string. in %s on line %d
+Warning: stripos(): Offset not contained in string in %s on line %d
bool(false)
-Warning: substr_count(): Offset value 2147483647 exceeds string length. in %s
on line %d
+Warning: substr_count(): Offset value 2147483647 exceeds string length in %s
on line %d
bool(false)
-Warning: substr_count(): Length value 2147483647 exceeds string length. in %s
on line %d
+Warning: substr_count(): Length value 2147483647 exceeds string length in %s
on line %d
bool(false)
-Warning: strpos(): Offset not contained in string. in %s on line %d
+Warning: strpos(): Offset not contained in string in %s on line %d
bool(false)
-Warning: stripos(): Offset not contained in string. in %s on line %d
+Warning: stripos(): Offset not contained in string in %s on line %d
bool(false)
Notice: strrpos(): Offset is greater than the length of haystack string in %s
on line %d
@@ -61,3 +61,38 @@
int(2)
string(8) "abcdeabc"
bool(false)
+--UEXPECTF--
+unicode(4) "bcde"
+bool(false)
+bool(false)
+bool(false)
+
+Warning: substr_count(): Offset value 2147483647 exceeds string length in %s
on line %d
+bool(false)
+
+Warning: substr_compare(): The start position cannot exceed initial string
length in %s on line %d
+bool(false)
+
+Warning: stripos(): Offset not contained in string in %s on line %d
+bool(false)
+
+Warning: substr_count(): Offset value 2147483647 exceeds string length in %s
on line %d
+bool(false)
+
+Warning: substr_count(): Length value 2147483647 exceeds string length in %s
on line %d
+bool(false)
+
+Warning: strpos(): Offset not contained in string in %s on line %d
+bool(false)
+
+Warning: stripos(): Offset not contained in string in %s on line %d
+bool(false)
+
+Notice: strrpos(): Offset is greater than the length of haystack string in %s
on line %d
+bool(false)
+
+Notice: strripos(): Offset is greater than the length of haystack string in %s
on line %d
+bool(false)
+int(2)
+unicode(8) "abcdeabc"
+bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubsc
[PHP-CVS] cvs: php-src /ext/standard/tests/strings strval.phpt
dmitry Mon Jun 18 11:54:02 2007 UTC
Modified files:
/php-src/ext/standard/tests/strings strval.phpt
Log:
Fixed test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strval.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/strval.phpt
diff -u php-src/ext/standard/tests/strings/strval.phpt:1.3
php-src/ext/standard/tests/strings/strval.phpt:1.4
--- php-src/ext/standard/tests/strings/strval.phpt:1.3 Tue Jan 17 12:18:53 2006
+++ php-src/ext/standard/tests/strings/strval.phpt Mon Jun 18 11:54:02 2007
@@ -13,7 +13,7 @@
var_dump(strval(false));
var_dump(strval(array('foo')));
?>
---EXPECT--
+--EXPECTF--
string(3) "bar"
string(3) "BAR"
string(6) "foobar"
@@ -21,8 +21,10 @@
string(3) "1.1"
string(1) "1"
string(0) ""
+
+Notice: Array to string conversion in %sstrval.php on line 11
string(5) "Array"
---UEXPECT--
+--UEXPECTF--
unicode(3) "bar"
unicode(3) "BAR"
unicode(6) "foobar"
@@ -30,4 +32,6 @@
unicode(3) "1.1"
unicode(1) "1"
unicode(0) ""
+
+Notice: Array to string conversion in %sstrval.php on line 11
unicode(5) "Array"
--
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
dmitry Mon Jun 18 11:50:41 2007 UTC
Modified files:
/php-src/ext/standard string.c
Log:
MTH: Fixed bug #40432 (strip_tags() fails with greater than in attribute).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.642&r2=1.643&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.642 php-src/ext/standard/string.c:1.643
--- php-src/ext/standard/string.c:1.642 Wed Jun 6 21:55:18 2007
+++ php-src/ext/standard/string.c Mon Jun 18 11:50:41 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.642 2007/06/06 21:55:18 tony2001 Exp $ */
+/* $Id: string.c,v 1.643 2007/06/18 11:50:41 dmitry Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -6314,6 +6314,7 @@
int32_t idx = 0, tmp, codepts;
UChar32 ch, next, prev1, prev2, last, doctype[6];
int br = 0, depth = 0, state = 0, i;
+ UChar in_q = 0;
if (stateptr)
state = *stateptr;
@@ -6389,10 +6390,14 @@
break;
}
+ if (in_q) {
+ break;
+ }
+
switch (state) {
case 1: /* HTML/XML */
last = ch;
- state = 0;
+ in_q = state = 0;
if (allow_len) {
tp = ((tp-tbuf) >=
UBYTES(PHP_TAG_BUF_SIZE) ? tbuf: tp);
*(tp++) = ch;
@@ -6407,19 +6412,19 @@
case 2: /* PHP */
if (!br && last != 0x22 && prev1 == 0x3F) { /*
'"' & '?' */
- state = 0;
+ in_q = state = 0;
tp = tbuf;
}
break;
case 3:
- state = 0;
+ in_q = state = 0;
tp = tbuf;
break;
case 4: /* JavaScript/CSS/etc... */
if (codepts >= 2 && prev1 == 0x2D && prev2 ==
0x2D) { /* '-' */
- state = 0;
+ in_q = state = 0;
tp = tbuf;
}
break;
@@ -6444,6 +6449,13 @@
tp = ((tp-tbuf) >= UBYTES(PHP_TAG_BUF_SIZE) ?
tbuf: tp);
*(tp++) = ch;
}
+ if (state && prev1 != 0x27 /*'\\'*/ && (!in_q || ch ==
in_q)) {
+ if (in_q) {
+ in_q = 0;
+ } else {
+ in_q = ch;
+ }
+ }
break;
case 0x21: /* '!' */
@@ -6541,7 +6553,7 @@
PHPAPI size_t php_strip_tags_ex(char *rbuf, int len, int *stateptr, char
*allow, int allow_len, zend_bool allow_tag_spaces)
{
char *tbuf, *buf, *p, *tp, *rp, c, lc;
- int br, i=0, depth=0;
+ int br, i=0, depth=0, in_q=0;
int state = 0;
if (stateptr)
@@ -6615,10 +6627,14 @@
break;
}
+ if (in_q) {
+ break;
+ }
+
switch (state) {
case 1: /* HTML/XML */
lc = '>';
- state = 0;
+ in_q = state = 0;
if (allow) {
tp = ((tp-tbuf) >=
PHP_TAG_BUF_SIZE ? tbuf: tp);
*(tp++) = '>';
@@ -6633,19 +6649,19 @@
case 2: /* PHP */
if (!br && lc != '\"' && *(p-1)
== '?') {
- state = 0;
+ in_q = state = 0;
tp = tbuf;
}
break;
case 3:
- state = 0;
+
[PHP-CVS] cvs: php-src /ext/zlib/tests bug_34821.phpt
dmitry Mon Jun 18 10:52:04 2007 UTC
Modified files:
/php-src/ext/zlib/tests bug_34821.phpt
Log:
Fixed test
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/bug_34821.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/zlib/tests/bug_34821.phpt
diff -u php-src/ext/zlib/tests/bug_34821.phpt:1.6
php-src/ext/zlib/tests/bug_34821.phpt:1.7
--- php-src/ext/zlib/tests/bug_34821.phpt:1.6 Wed Jan 3 22:33:33 2007
+++ php-src/ext/zlib/tests/bug_34821.phpt Mon Jun 18 10:52:04 2007
@@ -14,12 +14,12 @@
// 100, // works, but test would take too long
);
-$s = '';
+$s = b'';
$i = 0;
foreach ($b as $size) {
do {
- $s .= chr(rand(0,255));
+ $s .= (binary)chr(rand(0,255));
} while (++$i < $size);
var_dump($s === gzinflate(gzdeflate($s)));
var_dump($s === gzuncompress(gzcompress($s)));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib/tests ob_001.phpt ob_002.phpt
dmitry Mon Jun 18 10:47:33 2007 UTC
Modified files:
/php-src/ext/zlib/tests ob_001.phpt ob_002.phpt
Log:
Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/ob_001.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/zlib/tests/ob_001.phpt
diff -u php-src/ext/zlib/tests/ob_001.phpt:1.2
php-src/ext/zlib/tests/ob_001.phpt:1.3
--- php-src/ext/zlib/tests/ob_001.phpt:1.2 Thu Aug 31 16:28:46 2006
+++ php-src/ext/zlib/tests/ob_001.phpt Mon Jun 18 10:47:33 2007
@@ -5,6 +5,8 @@
if (!extension_loaded("zlib")) die("skip need ext/zlib");
if (false === stristr(PHP_SAPI, "cgi")) die("skip need sapi/cgi");
?>
+--GET--
+a=b
--INI--
zlib.output_compression=1
--ENV--
@@ -14,9 +16,4 @@
echo "hi\n";
?>
--EXPECTF--
-%s
-Content-Encoding: gzip
-Vary: Accept-Encoding
-%s
-
%s
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/ob_002.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/zlib/tests/ob_002.phpt
diff -u php-src/ext/zlib/tests/ob_002.phpt:1.2
php-src/ext/zlib/tests/ob_002.phpt:1.3
--- php-src/ext/zlib/tests/ob_002.phpt:1.2 Thu Aug 31 16:28:46 2006
+++ php-src/ext/zlib/tests/ob_002.phpt Mon Jun 18 10:47:33 2007
@@ -14,4 +14,4 @@
echo "hi\n";
?>
--EXPECTF--
-%shi
+hi
--
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/file readlink_realpath_basic.phpt readlink_realpath_variation.phpt TSRM tsrm_virtual_cwd.c
dmitry Mon Jun 18 09:51:03 2007 UTC
Modified files:
/TSRM tsrm_virtual_cwd.c
/php-src/ext/standard/tests/filereadlink_realpath_basic.phpt
readlink_realpath_variation.phpt
Log:
Fixed yet another realpath cache bug and wrong tests
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.109&r2=1.110&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.109 TSRM/tsrm_virtual_cwd.c:1.110
--- TSRM/tsrm_virtual_cwd.c:1.109 Wed May 30 10:50:45 2007
+++ TSRM/tsrm_virtual_cwd.c Mon Jun 18 09:51:03 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.109 2007/05/30 10:50:45 tony2001 Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.110 2007/06/18 09:51:03 dmitry Exp $ */
#include
#include
@@ -708,7 +708,7 @@
}
}
- if (use_cache) {
+ if (use_cache && (use_realpath == CWD_REALPATH)) {
realpath_cache_add(path, path_length, state->cwd,
state->cwd_length, t TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_basic.phpt
diff -u php-src/ext/standard/tests/file/readlink_realpath_basic.phpt:1.2
php-src/ext/standard/tests/file/readlink_realpath_basic.phpt:1.3
--- php-src/ext/standard/tests/file/readlink_realpath_basic.phpt:1.2Mon Jun
11 16:40:27 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_basic.phptMon Jun
18 09:51:03 2007
@@ -103,11 +103,11 @@
-- Iteration 1 --
string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic_link.tmp"
+string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-- Iteration 2 --
string(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
-string(%d)
"%s/readlink_realpath_basic/home/test/readlink_realpath_basic_link.tmp"
+string(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
-- Iteration 3 --
string(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
@@ -115,7 +115,7 @@
-- Iteration 4 --
string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic_link.tmp"
+string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-- Iteration 5 --
@@ -172,11 +172,11 @@
-- Iteration 1 --
unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic_link.tmp"
+unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-- Iteration 2 --
unicode(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
-unicode(%d)
"%s/readlink_realpath_basic/home/test/readlink_realpath_basic_link.tmp"
+unicode(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
-- Iteration 3 --
unicode(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
@@ -184,7 +184,7 @@
-- Iteration 4 --
unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic_link.tmp"
+unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-- Iteration 5 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_variation.phpt
diff -u php-src/ext/standard/tests/file/readlink_realpath_variation.phpt:1.2
php-src/ext/standard/tests/file/readlink_realpath_variation.phpt:1.3
--- php-src/ext/standard/tests/file/readlink_realpath_variation.phpt:1.2
Mon Jun 11 16:40:27 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_variation.phptMon Jun
18 09:51:03 2007
@@ -135,10 +135,10 @@
-- Testing readlink() and realpath() with softlink, linkname stored inside an
object --
bool(true)
string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-string(%d)
"%s/readlink_realpath_variation/home/readlink_realpath_variation_link.tmp"
+string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
bool(true)
string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-string(%d) "%s/readlink_realpath_variation_link.tmp"
+string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-- Testing readlink() and realpath() with hardlink, linkname stored inside an
object --
bool(true)
@@ -157,14 +157,14 @@
-- Testing readlink() and realpath() with softlink, linkname stored inside an
array --
bool(true)
string(%d)
"%s/readlink_realpath_varia
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file readlink_realpath_basic.phpt readlink_realpath_variation.phpt TSRM tsrm_virtual_cwd.c
dmitry Mon Jun 18 09:50:40 2007 UTC
Modified files: (Branch: PHP_5_2)
/TSRM tsrm_virtual_cwd.c
/php-src/ext/standard/tests/filereadlink_realpath_basic.phpt
readlink_realpath_variation.phpt
Log:
Fixed yet another realpath cache bug and wrong tests
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.29&r2=1.74.2.9.2.30&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.29
TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.30
--- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.29 Wed May 30 10:50:47 2007
+++ TSRM/tsrm_virtual_cwd.c Mon Jun 18 09:50:39 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.29 2007/05/30 10:50:47 tony2001 Exp $
*/
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.30 2007/06/18 09:50:39 dmitry Exp $ */
#include
#include
@@ -708,7 +708,7 @@
}
}
- if (use_cache) {
+ if (use_cache && (use_realpath == CWD_REALPATH)) {
realpath_cache_add(path, path_length, state->cwd,
state->cwd_length, t TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_basic.phpt
diff -u php-src/ext/standard/tests/file/readlink_realpath_basic.phpt:1.1.2.1
php-src/ext/standard/tests/file/readlink_realpath_basic.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/readlink_realpath_basic.phpt:1.1.2.1
Mon Jun 11 16:14:59 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_basic.phptMon Jun
18 09:50:40 2007
@@ -103,11 +103,11 @@
-- Iteration 1 --
string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic_link.tmp"
+string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-- Iteration 2 --
string(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
-string(%d)
"%s/readlink_realpath_basic/home/test/readlink_realpath_basic_link.tmp"
+string(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
-- Iteration 3 --
string(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
@@ -115,7 +115,7 @@
-- Iteration 4 --
string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic_link.tmp"
+string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-- Iteration 5 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_variation.phpt
diff -u
php-src/ext/standard/tests/file/readlink_realpath_variation.phpt:1.1.2.1
php-src/ext/standard/tests/file/readlink_realpath_variation.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/readlink_realpath_variation.phpt:1.1.2.1
Mon Jun 11 16:14:59 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_variation.phptMon Jun
18 09:50:40 2007
@@ -135,10 +135,10 @@
-- Testing readlink() and realpath() with softlink, linkname stored inside an
object --
bool(true)
string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-string(%d)
"%s/readlink_realpath_variation/home/readlink_realpath_variation_link.tmp"
+string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
bool(true)
string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-string(%d) "%s/readlink_realpath_variation_link.tmp"
+string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-- Testing readlink() and realpath() with hardlink, linkname stored inside an
object --
bool(true)
@@ -157,14 +157,14 @@
-- Testing readlink() and realpath() with softlink, linkname stored inside an
array --
bool(true)
string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation_link.tmp"
+string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
Warning: symlink(): No such file or directory in %s on line %d
bool(false)
Warning: readlink(): No such file or directory in %s on line %d
bool(false)
-string(%d) "%s/home/readlink_realpath_variation_link.tmp"
+bool(false)
Warning:
unlink(%s/./readlink_realpath_variation/home/../home//tests//..//..//..//home//readlink_realpath_variation_link.tmp/):
No such file or directory in %s on line %d
@@ -180,7 +180,7 @@
Warning: readlink(): No such file or directory in %s on line %d
bool(false)
-string(%d) "%s/home/readlink_realpath_variation_link.tmp"
+boo
[PHP-CVS] cvs: php-src /ext/standard/tests/array range.phpt
dmitry Mon Jun 18 07:45:24 2007 UTC
Modified files:
/php-src/ext/standard/tests/array range.phpt
Log:
Fixed test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/range.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/array/range.phpt
diff -u php-src/ext/standard/tests/array/range.phpt:1.4
php-src/ext/standard/tests/array/range.phpt:1.5
--- php-src/ext/standard/tests/array/range.phpt:1.4 Wed May 16 21:10:57 2007
+++ php-src/ext/standard/tests/array/range.phpt Mon Jun 18 07:45:24 2007
@@ -53,7 +53,7 @@
for( $i = 0; $i < count($low_arr); $i++) {
for( $j = 0; $j < count($high_arr); $j++) {
-echo "\n-- creating an array with low = '$low_arr[$i]' and high =
'$high_arr[$j]' --\n";
+echo @"\n-- creating an array with low = '$low_arr[$i]' and high =
'$high_arr[$j]' --\n";
var_dump( range( $low_arr[$i], $high_arr[$j] ) );
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug32924.phpt
dmitry Mon Jun 18 07:31:45 2007 UTC
Modified files:
/php-src/tests/lang bug32924.phpt
Log:
Fixed test file
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug32924.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/tests/lang/bug32924.phpt
diff -u php-src/tests/lang/bug32924.phpt:1.2
php-src/tests/lang/bug32924.phpt:1.3
--- php-src/tests/lang/bug32924.phpt:1.2Tue Aug 2 15:13:21 2005
+++ php-src/tests/lang/bug32924.phptMon Jun 18 07:31:45 2007
@@ -1,12 +1,12 @@
--TEST--
Bug #32924 (prepend does not add file to included files)
--INI--
-include_path=.
-auto_prepend_file=tests/lang/inc.inc
+include_path={PWD}
+auto_prepend_file=inc.inc
--FILE--
END
--EXPECT--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
