[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
stasThu Sep 13 20:08:00 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: register mail.force_extra_parameters change http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.948&r2=1.2027.2.547.2.949&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.948 php-src/NEWS:1.2027.2.547.2.949 --- php-src/NEWS:1.2027.2.547.2.948 Thu Sep 13 17:15:02 2007 +++ php-src/NEWSThu Sep 13 20:08:00 2007 @@ -16,6 +16,8 @@ - Fixed imagerectangle regression with 1x1 rectangle (libgd #106). (Pierre) - Fixed PDO crash when dirver returns empty LOB stream (Stas). - Fixed dl() to accept only filenames - reported by Laurent Gaffie. (Stas) +- Disallowed setting mail.force_extra_parameters from .htaccess due + to the security implications - reported by SecurityReason (Stas) - Fixed bug #42643 (CLI segfaults if using ATTR_PERSISTENT). (Ilia) - Fixed bug #42627 (bz2 extension fails to build with -fno-common). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
stasThu Sep 13 20:06:15 2007 UTC
Modified files:
/php-src/main main.c
Log:
MFB: disallow setting mail.force_extra_parameters from .htaccess
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.746&r2=1.747&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.746 php-src/main/main.c:1.747
--- php-src/main/main.c:1.746 Fri Aug 31 08:35:07 2007
+++ php-src/main/main.c Thu Sep 13 20:06:15 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.746 2007/08/31 08:35:07 jani Exp $ */
+/* $Id: main.c,v 1.747 2007/09/13 20:06:15 stas Exp $ */
/* {{{ includes
*/
@@ -434,6 +434,18 @@
}
/* }}} */
+/* {{{ PHP_INI_MH
+ */
+static PHP_INI_MH(OnChangeMailForceExtra)
+{
+ /* Don't allow changing it in htaccess */
+ if (stage == PHP_INI_STAGE_HTACCESS) {
+ return FAILURE;
+ }
+ return SUCCESS;
+}
+/* }}} */
+
/*
* Need to be read from the environment (?):
* PHP_AUTO_PREPEND_FILE
@@ -524,7 +536,7 @@
PHP_INI_ENTRY("precision", "14",
PHP_INI_ALL,OnSetPrecision)
PHP_INI_ENTRY("sendmail_from", NULL,
PHP_INI_ALL,NULL)
PHP_INI_ENTRY("sendmail_path", DEFAULT_SENDMAIL_PATH, PHP_INI_SYSTEM,
NULL)
- PHP_INI_ENTRY("mail.force_extra_parameters",NULL,
PHP_INI_SYSTEM|PHP_INI_PERDIR, NULL)
+ PHP_INI_ENTRY("mail.force_extra_parameters",NULL,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnChangeMailForceExtra)
PHP_INI_ENTRY("disable_functions", "",
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY("disable_classes","",
PHP_INI_SYSTEM, NULL)
--
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) /main main.c
stasThu Sep 13 20:04:23 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main main.c
Log:
disallow setting mail.force_extra_parameters from .htaccess
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.54&r2=1.640.2.23.2.55&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.54 php-src/main/main.c:1.640.2.23.2.55
--- php-src/main/main.c:1.640.2.23.2.54 Fri Aug 31 08:35:37 2007
+++ php-src/main/main.c Thu Sep 13 20:04:22 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23.2.54 2007/08/31 08:35:37 jani Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.55 2007/09/13 20:04:22 stas Exp $ */
/* {{{ includes
*/
@@ -318,6 +318,19 @@
}
/* }}} */
+/* {{{ PHP_INI_MH
+ */
+static PHP_INI_MH(OnChangeMailForceExtra)
+{
+ /* Don't allow changing it in htaccess */
+ if (stage == PHP_INI_STAGE_HTACCESS) {
+ return FAILURE;
+ }
+ return SUCCESS;
+}
+/* }}} */
+
+
/* Need to convert to strings and make use of:
* PHP_SAFE_MODE
*
@@ -428,7 +441,7 @@
PHP_INI_ENTRY("precision", "14",
PHP_INI_ALL,OnSetPrecision)
PHP_INI_ENTRY("sendmail_from", NULL,
PHP_INI_ALL,NULL)
PHP_INI_ENTRY("sendmail_path", DEFAULT_SENDMAIL_PATH, PHP_INI_SYSTEM,
NULL)
- PHP_INI_ENTRY("mail.force_extra_parameters",NULL,
PHP_INI_SYSTEM|PHP_INI_PERDIR, NULL)
+ PHP_INI_ENTRY("mail.force_extra_parameters",NULL,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnChangeMailForceExtra)
PHP_INI_ENTRY("disable_functions", "",
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY("disable_classes","",
PHP_INI_SYSTEM, NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests bug35885.phpt
nlopess Thu Sep 13 19:58:53 2007 UTC Modified files: /php-src/ext/date/tests bug35885.phpt Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug35885.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/date/tests/bug35885.phpt diff -u php-src/ext/date/tests/bug35885.phpt:1.2 php-src/ext/date/tests/bug35885.phpt:1.3 --- php-src/ext/date/tests/bug35885.phpt:1.2Wed Apr 11 22:35:25 2007 +++ php-src/ext/date/tests/bug35885.phptThu Sep 13 19:58:53 2007 @@ -4,8 +4,9 @@ http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/tests bug35885.phpt
nlopess Thu Sep 13 19:58:26 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/date/tests bug35885.phpt Log: fix test, particularly when running with valgrind, bacause it may take more than one second to execute both instructions and thus get different dates http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug35885.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/date/tests/bug35885.phpt diff -u php-src/ext/date/tests/bug35885.phpt:1.1.2.2.2.1 php-src/ext/date/tests/bug35885.phpt:1.1.2.2.2.2 --- php-src/ext/date/tests/bug35885.phpt:1.1.2.2.2.1Wed Apr 11 22:34:48 2007 +++ php-src/ext/date/tests/bug35885.phptThu Sep 13 19:58:26 2007 @@ -4,8 +4,9 @@ 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 strtoupper1.phpt
nlopess Thu Sep 13 19:51:34 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings strtoupper1.phpt Log: attemp to set locale if it exists. fix skip condition http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtoupper1.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/strtoupper1.phpt diff -u php-src/ext/standard/tests/strings/strtoupper1.phpt:1.1.2.1 php-src/ext/standard/tests/strings/strtoupper1.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/strtoupper1.phpt:1.1.2.1 Fri Aug 10 03:03:49 2007 +++ php-src/ext/standard/tests/strings/strtoupper1.phpt Thu Sep 13 19:51:34 2007 @@ -2,8 +2,8 @@ Test strtoupper() function --SKIPIF-- --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings strtoupper1.phpt
nlopess Thu Sep 13 19:52:45 2007 UTC Modified files: /php-src/ext/standard/tests/strings strtoupper1.phpt Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtoupper1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/strtoupper1.phpt diff -u php-src/ext/standard/tests/strings/strtoupper1.phpt:1.2 php-src/ext/standard/tests/strings/strtoupper1.phpt:1.3 --- php-src/ext/standard/tests/strings/strtoupper1.phpt:1.2 Fri Aug 10 03:05:00 2007 +++ php-src/ext/standard/tests/strings/strtoupper1.phpt Thu Sep 13 19:52:45 2007 @@ -2,8 +2,8 @@ Test strtoupper() function --SKIPIF-- --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings strtolower.phpt
nlopess Thu Sep 13 19:48:58 2007 UTC Modified files: /php-src/ext/standard/tests/strings strtolower.phpt Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtolower.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/strtolower.phpt diff -u php-src/ext/standard/tests/strings/strtolower.phpt:1.2 php-src/ext/standard/tests/strings/strtolower.phpt:1.3 --- php-src/ext/standard/tests/strings/strtolower.phpt:1.2 Fri Aug 10 03:05:00 2007 +++ php-src/ext/standard/tests/strings/strtolower.phpt Thu Sep 13 19:48:58 2007 @@ -2,8 +2,8 @@ Test strtolower() function --SKIPIF-- --FILE-- 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 strtolower.phpt
nlopess Thu Sep 13 19:46:49 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings strtolower.phpt Log: attemp to set locale if it exists. fix skip condition http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtolower.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/strtolower.phpt diff -u php-src/ext/standard/tests/strings/strtolower.phpt:1.1.2.1 php-src/ext/standard/tests/strings/strtolower.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/strtolower.phpt:1.1.2.1 Fri Aug 10 03:03:49 2007 +++ php-src/ext/standard/tests/strings/strtolower.phpt Thu Sep 13 19:46:49 2007 @@ -2,8 +2,8 @@ Test strtolower() function --SKIPIF-- --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug20175.phpt
nlopess Thu Sep 13 19:31:08 2007 UTC Modified files: /php-src/tests/lang bug20175.phpt Log: MFB: fix expected output http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug20175.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/tests/lang/bug20175.phpt diff -u php-src/tests/lang/bug20175.phpt:1.8 php-src/tests/lang/bug20175.phpt:1.9 --- php-src/tests/lang/bug20175.phpt:1.8Thu May 5 17:37:25 2005 +++ php-src/tests/lang/bug20175.phptThu Sep 13 19:31:08 2007 @@ -139,6 +139,7 @@ print $oop_tester->oop_static()."\n"; ?> --EXPECTF-- +Strict Standards: Assigning the return value of new by reference is deprecated in %s.php on line %d %s foo_static() foo_global() -- 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) /tests/lang bug20175.phpt
nlopess Thu Sep 13 19:30:19 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/lang bug20175.phpt Log: fix expected output http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug20175.phpt?r1=1.8&r2=1.8.4.1&diff_format=u Index: php-src/tests/lang/bug20175.phpt diff -u php-src/tests/lang/bug20175.phpt:1.8 php-src/tests/lang/bug20175.phpt:1.8.4.1 --- php-src/tests/lang/bug20175.phpt:1.8Thu May 5 17:37:25 2005 +++ php-src/tests/lang/bug20175.phptThu Sep 13 19:30:19 2007 @@ -139,6 +139,7 @@ print $oop_tester->oop_static()."\n"; ?> --EXPECTF-- +Strict Standards: Assigning the return value of new by reference is deprecated in %s.php on line %d %s foo_static() foo_global() -- 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 bug41655_2.phpt
nlopess Thu Sep 13 18:56:21 2007 UTC Modified files: /php-src/ext/standard/tests/filebug41655_2.phpt Log: MFB: fix expected output http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/bug41655_2.phpt diff -u php-src/ext/standard/tests/file/bug41655_2.phpt:1.2 php-src/ext/standard/tests/file/bug41655_2.phpt:1.3 --- php-src/ext/standard/tests/file/bug41655_2.phpt:1.2 Fri Jun 22 12:36:55 2007 +++ php-src/ext/standard/tests/file/bug41655_2.phpt Thu Sep 13 18:56:21 2007 @@ -11,6 +11,7 @@ --EXPECTF-- Array ( -[%d] => %sbug41655_1.phpt -[%d] => %sbug41655_2.phpt +[0] => %sbug41655_1.phpt +[1] => %sbug41655_2.php +[2] => %sbug41655_2.phpt ) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file bug41655_2.phpt
nlopess Thu Sep 13 18:55:28 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filebug41655_2.phpt Log: fix test expected output http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41655_2.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/file/bug41655_2.phpt diff -u php-src/ext/standard/tests/file/bug41655_2.phpt:1.1.4.2 php-src/ext/standard/tests/file/bug41655_2.phpt:1.1.4.3 --- php-src/ext/standard/tests/file/bug41655_2.phpt:1.1.4.2 Fri Jun 22 12:35:41 2007 +++ php-src/ext/standard/tests/file/bug41655_2.phpt Thu Sep 13 18:55:28 2007 @@ -11,6 +11,7 @@ --EXPECTF-- Array ( -[%d] => %sbug41655_1.phpt -[%d] => %sbug41655_2.phpt +[0] => %sbug41655_1.phpt +[1] => %sbug41655_2.php +[2] => %sbug41655_2.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/file 006_basic.phpt 006_error.phpt 006_variation1.phpt 006_variation2.phpt copy_variation15.phpt copy_variation9.phpt is_executable_basic.phpt is_executable_
nlopess Thu Sep 13 18:26:12 2007 UTC
Modified files:
/php-src/ext/standard/tests/file006_basic.phpt 006_error.phpt
006_variation1.phpt
006_variation2.phpt
copy_variation15.phpt
copy_variation9.phpt
is_executable_basic.phpt
is_executable_variation1.phpt
is_executable_variation2.phpt
is_executable_variation3.phpt
is_readable_basic.phpt
is_readable_variation1.phpt
is_readable_variation2.phpt
is_readable_variation3.phpt
is_writable_basic.phpt
mkdir_rmdir_variation1.phpt
mkdir_rmdir_variation2.phpt
symlink_link_linkinfo_is_link_variation6.phpt
unlink_variation1.phpt
Log:
MFB: fix skip reasons
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_basic.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/file/006_basic.phpt
diff -u php-src/ext/standard/tests/file/006_basic.phpt:1.3
php-src/ext/standard/tests/file/006_basic.phpt:1.4
--- php-src/ext/standard/tests/file/006_basic.phpt:1.3 Fri Jul 6 03:24:27 2007
+++ php-src/ext/standard/tests/file/006_basic.phpt Thu Sep 13 18:26:12 2007
@@ -11,7 +11,7 @@
fclose($fp);
if(fileowner($filename) == 0) {
unlink ($filename);
-die('skip...cannot be run as root\n');
+die('skip cannot be run as root');
}
unlink($filename);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_error.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/file/006_error.phpt
diff -u php-src/ext/standard/tests/file/006_error.phpt:1.3
php-src/ext/standard/tests/file/006_error.phpt:1.4
--- php-src/ext/standard/tests/file/006_error.phpt:1.3 Thu Jul 5 18:59:20 2007
+++ php-src/ext/standard/tests/file/006_error.phpt Thu Sep 13 18:26:12 2007
@@ -11,7 +11,7 @@
fclose($fp);
if(fileowner($filename) == 0) {
unlink ($filename);
-die('skip...cannot be run as root\n');
+die('skip cannot be run as root');
}
unlink($filename);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/file/006_variation1.phpt
diff -u php-src/ext/standard/tests/file/006_variation1.phpt:1.3
php-src/ext/standard/tests/file/006_variation1.phpt:1.4
--- php-src/ext/standard/tests/file/006_variation1.phpt:1.3 Fri Jul 6
03:24:27 2007
+++ php-src/ext/standard/tests/file/006_variation1.phpt Thu Sep 13 18:26:12 2007
@@ -11,7 +11,7 @@
fclose($fp);
if(fileowner($filename) == 0) {
unlink ($filename);
-die('skip...cannot be run as root\n');
+die('skip cannot be run as root');
}
unlink($filename);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation2.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/file/006_variation2.phpt
diff -u php-src/ext/standard/tests/file/006_variation2.phpt:1.3
php-src/ext/standard/tests/file/006_variation2.phpt:1.4
--- php-src/ext/standard/tests/file/006_variation2.phpt:1.3 Fri Jul 6
03:24:27 2007
+++ php-src/ext/standard/tests/file/006_variation2.phpt Thu Sep 13 18:26:12 2007
@@ -11,7 +11,7 @@
fclose($fp);
if(fileowner($filename) == 0) {
unlink ($filename);
-die('skip...cannot be run as root\n');
+die('skip cannot be run as root');
}
unlink($filename);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation15.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation15.phpt
diff -u php-src/ext/standard/tests/file/copy_variation15.phpt:1.5
php-src/ext/standard/tests/file/copy_variation15.phpt:1.6
--- php-src/ext/standard/tests/file/copy_variation15.phpt:1.5 Tue Sep 4
08:39:40 2007
+++ php-src/ext/standard/tests/file/copy_variation15.phpt Thu Sep 13
18:26:12 2007
@@ -10,7 +10,7 @@
fclose($fp);
if(fileowner($filename) == 0) {
unlink ($filename);
-die('skip...cannot be run as root\n');
+die('skip cannot be run as root');
}
unlink($filename);
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation9.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation9.phpt
diff -u php-src/ext/standard/tests/file/copy_variation9.phpt:1.5
php-src/ext/standard/tests/file/copy_variation9.phpt:1.6
--- php-src/ext/standard/tests/file/copy_variation9
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file 006_basic.phpt 006_error.phpt 006_variation1.phpt 006_variation2.phpt copy_variation15.phpt copy_variation9.phpt is_executable_basic.phpt is_ex
nlopess Thu Sep 13 18:24:26 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/file006_basic.phpt 006_error.phpt
006_variation1.phpt
006_variation2.phpt
copy_variation15.phpt
copy_variation9.phpt
is_executable_basic.phpt
is_executable_variation1.phpt
is_executable_variation2.phpt
is_executable_variation3.phpt
is_readable_basic.phpt
is_readable_variation1.phpt
is_readable_variation2.phpt
is_readable_variation3.phpt
is_writable_basic.phpt
is_writable_variation1.phpt
is_writable_variation2.phpt
is_writable_variation3.phpt
mkdir_rmdir_variation1.phpt
mkdir_rmdir_variation2.phpt
symlink_link_linkinfo_is_link_variation6.phpt
unlink_variation1.phpt
Log:
fix skip reasons. the word 'skip' should be followed by a single space and
doesnt need any \n at the end
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_basic.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/006_basic.phpt
diff -u php-src/ext/standard/tests/file/006_basic.phpt:1.1.2.2
php-src/ext/standard/tests/file/006_basic.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/006_basic.phpt:1.1.2.2 Fri Jul 6
03:40:31 2007
+++ php-src/ext/standard/tests/file/006_basic.phpt Thu Sep 13 18:24:26 2007
@@ -11,7 +11,7 @@
fclose($fp);
if(fileowner($filename) == 0) {
unlink ($filename);
-die('skip...cannot be run as root\n');
+die('skip cannot be run as root');
}
unlink($filename);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/006_error.phpt
diff -u php-src/ext/standard/tests/file/006_error.phpt:1.1.2.2
php-src/ext/standard/tests/file/006_error.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/006_error.phpt:1.1.2.2 Thu Jul 5
18:53:33 2007
+++ php-src/ext/standard/tests/file/006_error.phpt Thu Sep 13 18:24:26 2007
@@ -11,7 +11,7 @@
fclose($fp);
if(fileowner($filename) == 0) {
unlink ($filename);
-die('skip...cannot be run as root\n');
+die('skip cannot be run as root');
}
unlink($filename);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/006_variation1.phpt
diff -u php-src/ext/standard/tests/file/006_variation1.phpt:1.1.2.2
php-src/ext/standard/tests/file/006_variation1.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/006_variation1.phpt:1.1.2.2 Fri Jul 6
03:40:31 2007
+++ php-src/ext/standard/tests/file/006_variation1.phpt Thu Sep 13 18:24:26 2007
@@ -11,7 +11,7 @@
fclose($fp);
if(fileowner($filename) == 0) {
unlink ($filename);
-die('skip...cannot be run as root\n');
+die('skip cannot be run as root');
}
unlink($filename);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/006_variation2.phpt
diff -u php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.2
php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.2 Fri Jul 6
03:40:31 2007
+++ php-src/ext/standard/tests/file/006_variation2.phpt Thu Sep 13 18:24:26 2007
@@ -11,7 +11,7 @@
fclose($fp);
if(fileowner($filename) == 0) {
unlink ($filename);
-die('skip...cannot be run as root\n');
+die('skip cannot be run as root');
}
unlink($filename);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation15.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation15.phpt
diff -u php-src/ext/standard/tests/file/copy_variation15.phpt:1.1.2.4
php-src/ext/standard/tests/file/copy_variation15.phpt:1.1.2.5
--- php-src/ext/standard/tests/file/copy_variation15.phpt:1.1.2.4 Tue Sep
4 08:37:51 2007
+++ php-src/ext/standard/tests/file/copy_variation15.phpt Thu Sep 13
18:24:26 2007
@@ -10,7 +10,7 @@
fclose($fp);
if(fileowner($filename) == 0) {
unlink ($filename);
-die('skip...cannot be run as root\n');
+
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
stasThu Sep 13 17:15:03 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: List recent fixes http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.947&r2=1.2027.2.547.2.948&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.947 php-src/NEWS:1.2027.2.547.2.948 --- php-src/NEWS:1.2027.2.547.2.947 Wed Sep 12 18:26:48 2007 +++ php-src/NEWSThu Sep 13 17:15:02 2007 @@ -14,6 +14,8 @@ imlplementations of the fnmatch(), setlocale() and glob() functions. Reported by Laurent gaffie. (Ilia) - Fixed imagerectangle regression with 1x1 rectangle (libgd #106). (Pierre) +- Fixed PDO crash when dirver returns empty LOB stream (Stas). +- Fixed dl() to accept only filenames - reported by Laurent Gaffie. (Stas) - Fixed bug #42643 (CLI segfaults if using ATTR_PERSISTENT). (Ilia) - Fixed bug #42627 (bz2 extension fails to build with -fno-common). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard dl.c
Wouldn't something with strcspn and a string build form '/' and DEFAULT_SLASH be faster? Not sure. I would rather use strpbrk, though I'm not sure how easy is to actually build that string from macros. But dl() is anyway not the shining star of performance, so saving a dozen of CPU cycles while we are going to spend thousands on loading new module wasn't a big priority. But you may fix it if you feel it's worth it :) -- Stanislav Malyshev, Zend Software Architect [EMAIL PROTECTED] http://www.zend.com/ (408)253-8829 MSN: [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
philip Thu Sep 13 16:40:09 2007 UTC Modified files: /CVSROOTavail Log: phpdoc-id and smarty docs karma for Zaenal Mutaqin (adezm) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1304&r2=1.1305&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1304 CVSROOT/avail:1.1305 --- CVSROOT/avail:1.1304Wed Sep 12 21:58:55 2007 +++ CVSROOT/avail Thu Sep 13 16:40:09 2007 @@ -74,6 +74,7 @@ avail|magidev,colder|phpdoc-fr avail|xdanger|phpdoc-zh,phpdoc-hk avail|chappy,ayame|phpdoc-hu +avail|adezm|phpdoc-id avail|elf,shimooka,masugata|phpdoc-ja avail|acidd15|phpdoc-kr avail|neonz|phpdoc-lv @@ -118,7 +119,7 @@ # The Smarty docs translators -avail|jsgoupil,gerald,arno,fernando,marcelo,surfmax,didou,nlopess,tony2001,freespace,thomasgm,yannick,pete_morgan,forestaki,mattes,fernandoc,mrtinez,takagi|smarty/docs +avail|jsgoupil,gerald,arno,fernando,marcelo,surfmax,didou,nlopess,tony2001,freespace,thomasgm,yannick,pete_morgan,forestaki,mattes,fernandoc,mrtinez,takagi,adezm|smarty/docs # The Smarty Web Group has access to the Smarty website. -- 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 htmlentities04.phpt htmlentities15.phpt
iliaa Thu Sep 13 15:36:50 2007 UTC
Modified files:
/php-src/ext/standard/tests/strings htmlentities04.phpt
htmlentities15.phpt
Log:
MFB: Added a note indicating that the tests may fail to due libc
implementation
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities04.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities04.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities04.phpt:1.7
php-src/ext/standard/tests/strings/htmlentities04.phpt:1.8
--- php-src/ext/standard/tests/strings/htmlentities04.phpt:1.7 Tue Nov 12
21:37:54 2002
+++ php-src/ext/standard/tests/strings/htmlentities04.phpt Thu Sep 13
15:36:50 2007
@@ -6,6 +6,7 @@
if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) == 0)
{
die("skip setlocale() failed\n");
}
+echo "warn possibly braindead libc\n";
?>
--INI--
output_handler=
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities15.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities15.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities15.phpt:1.3
php-src/ext/standard/tests/strings/htmlentities15.phpt:1.4
--- php-src/ext/standard/tests/strings/htmlentities15.phpt:1.3 Sun Aug 27
15:06:15 2006
+++ php-src/ext/standard/tests/strings/htmlentities15.phpt Thu Sep 13
15:36:50 2007
@@ -12,6 +12,7 @@
if (!$result || preg_match('/koi8/i', setlocale(LC_CTYPE, 0)) == 0) {
die("skip setlocale() failed\n");
}
+echo "warn possibly braindead libc\n";
?>
--FILE--
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 htmlentities04.phpt htmlentities15.phpt
iliaa Thu Sep 13 15:36:37 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings htmlentities04.phpt
htmlentities15.phpt
Log:
Added a note indicating that the tests may fail to due libc implementation
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities04.phpt?r1=1.7&r2=1.7.20.1&diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities04.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities04.phpt:1.7
php-src/ext/standard/tests/strings/htmlentities04.phpt:1.7.20.1
--- php-src/ext/standard/tests/strings/htmlentities04.phpt:1.7 Tue Nov 12
21:37:54 2002
+++ php-src/ext/standard/tests/strings/htmlentities04.phpt Thu Sep 13
15:36:37 2007
@@ -6,6 +6,7 @@
if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) == 0)
{
die("skip setlocale() failed\n");
}
+echo "warn possibly braindead libc\n";
?>
--INI--
output_handler=
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities15.phpt?r1=1.1.8.1&r2=1.1.8.2&diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities15.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities15.phpt:1.1.8.1
php-src/ext/standard/tests/strings/htmlentities15.phpt:1.1.8.2
--- php-src/ext/standard/tests/strings/htmlentities15.phpt:1.1.8.1 Sun Aug
27 15:06:53 2006
+++ php-src/ext/standard/tests/strings/htmlentities15.phpt Thu Sep 13
15:36:37 2007
@@ -10,6 +10,7 @@
if (!$result || preg_match('/koi8/i', setlocale(LC_CTYPE, 0)) == 0) {
die("skip setlocale() failed\n");
}
+echo "warn possibly braindead libc\n";
?>
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard dl.c
Hello Stanislav,
Thursday, September 13, 2007, 3:16:24 AM, you wrote:
> stasThu Sep 13 01:16:24 2007 UTC
> Modified files:
> /php-src/ext/standard dl.c
> Log:
> MFB: docs say dl() parameter can be filename only - enforce it
>
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.114&r2=1.115&diff_format=u
> Index: php-src/ext/standard/dl.c
> diff -u php-src/ext/standard/dl.c:1.114 php-src/ext/standard/dl.c:1.115
> --- php-src/ext/standard/dl.c:1.114 Tue May 29 21:24:45 2007
> +++ php-src/ext/standard/dl.c Thu Sep 13 01:16:24 2007
> @@ -18,7 +18,7 @@
> +--+
> */
>
> -/* $Id: dl.c,v 1.114 2007/05/29 21:24:45 tony2001 Exp $ */
> +/* $Id: dl.c,v 1.115 2007/09/13 01:16:24 stas Exp $ */
>
> #include "php.h"
> #include "dl.h"
> @@ -115,6 +115,13 @@
> if (extension_dir && extension_dir[0]){
> int extension_dir_len = strlen(extension_dir);
>
> + if(type == MODULE_TEMPORARY) {
> + if(strchr(filename, '/') != NULL ||
> strchr(filename, DEFAULT_SLASH) != NULL) {
Wouldn't something with strcspn and a string build form '/' and
DEFAULT_SLASH be faster?
> + php_error_docref(NULL TSRMLS_CC,
> E_WARNING, "Temporary module name should contain only
> filename");
> + RETURN_FALSE;
> + }
> + }
> +
> if (IS_SLASH(extension_dir[extension_dir_len-1])) {
> spprintf(&libpath, 0, "%s%s", extension_dir,
> filename); /* SAFE */
> } else {
Best regards,
Marcus
--
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 dl.c
janiThu Sep 13 07:42:12 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard dl.c
Log:
MFH: cs/ws
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.106.2.1.2.3&r2=1.106.2.1.2.4&diff_format=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.106.2.1.2.3
php-src/ext/standard/dl.c:1.106.2.1.2.4
--- php-src/ext/standard/dl.c:1.106.2.1.2.3 Thu Sep 13 00:56:31 2007
+++ php-src/ext/standard/dl.c Thu Sep 13 07:42:12 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.106.2.1.2.3 2007/09/13 00:56:31 stas Exp $ */
+/* $Id: dl.c,v 1.106.2.1.2.4 2007/09/13 07:42:12 jani Exp $ */
#include "php.h"
#include "dl.h"
@@ -125,8 +125,8 @@
if (extension_dir && extension_dir[0]){
int extension_dir_len = strlen(extension_dir);
- if(type == MODULE_TEMPORARY) {
- if(strchr(Z_STRVAL_P(file), '/') != NULL ||
strchr(Z_STRVAL_P(file), DEFAULT_SLASH) != NULL) {
+ if (type == MODULE_TEMPORARY) {
+ if (strchr(Z_STRVAL_P(file), '/') != NULL ||
strchr(Z_STRVAL_P(file), DEFAULT_SLASH) != NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Temporary module name should contain only filename");
RETURN_FALSE;
}
@@ -196,8 +196,9 @@
int zend_api;
unsigned char zend_debug, zts;
- if(( ((struct pre_4_1_0_module_entry
*)module_entry)->zend_api > 2000)
- &&(((struct pre_4_1_0_module_entry
*)module_entry)->zend_api < 20010901)) {
+ if struct pre_4_1_0_module_entry
*)module_entry)->zend_api > 2000) &&
+ (((struct pre_4_1_0_module_entry
*)module_entry)->zend_api < 20010901)
+ ) {
name = ((struct pre_4_1_0_module_entry
*)module_entry)->name;
zend_api = ((struct pre_4_1_0_module_entry
*)module_entry)->zend_api;
zend_debug = ((struct pre_4_1_0_module_entry
*)module_entry)->zend_debug;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dl.c
janiThu Sep 13 07:41:59 2007 UTC
Modified files:
/php-src/ext/standard dl.c
Log:
cs/ws fix
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.115&r2=1.116&diff_format=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.115 php-src/ext/standard/dl.c:1.116
--- php-src/ext/standard/dl.c:1.115 Thu Sep 13 01:16:24 2007
+++ php-src/ext/standard/dl.c Thu Sep 13 07:41:59 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.115 2007/09/13 01:16:24 stas Exp $ */
+/* $Id: dl.c,v 1.116 2007/09/13 07:41:59 jani Exp $ */
#include "php.h"
#include "dl.h"
@@ -115,8 +115,8 @@
if (extension_dir && extension_dir[0]){
int extension_dir_len = strlen(extension_dir);
- if(type == MODULE_TEMPORARY) {
- if(strchr(filename, '/') != NULL || strchr(filename,
DEFAULT_SLASH) != NULL) {
+ if (type == MODULE_TEMPORARY) {
+ if (strchr(filename, '/') != NULL || strchr(filename,
DEFAULT_SLASH) != NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Temporary module name should contain only filename");
RETURN_FALSE;
}
@@ -190,8 +190,9 @@
int zend_api;
unsigned char zend_debug, zts;
- if(( ((struct pre_4_1_0_module_entry
*)module_entry)->zend_api > 2000)
- &&(((struct pre_4_1_0_module_entry
*)module_entry)->zend_api < 20010901)) {
+ if struct pre_4_1_0_module_entry
*)module_entry)->zend_api > 2000) &&
+ (((struct pre_4_1_0_module_entry
*)module_entry)->zend_api < 20010901)
+ ) {
name = ((struct pre_4_1_0_module_entry
*)module_entry)->name;
zend_api = ((struct pre_4_1_0_module_entry
*)module_entry)->zend_api;
zend_debug = ((struct pre_4_1_0_module_entry
*)module_entry)->zend_debug;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
