[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Sep 8 01:31:18 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2801r2=1.2802diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2801 php-src/ChangeLog:1.2802 --- php-src/ChangeLog:1.2801Fri Sep 7 01:31:13 2007 +++ php-src/ChangeLog Sat Sep 8 01:31:17 2007 @@ -1,3 +1,179 @@ +2007-09-07 Pierre-Alain Joye [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/string.c: + - #42592, remove ending dot in warning msg + +2007-09-07 Raghubansh Kumar [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/tests/strings/ucwords_basic.phpt + ext/standard/tests/strings/ucwords_error.phpt + ext/standard/tests/strings/ucwords_variation1.phpt + ext/standard/tests/strings/ucwords_variation2.phpt + ext/standard/tests/strings/ucwords_variation3.phpt + ext/standard/tests/strings/ucwords_variation4.phpt: + New testcases for ucwords() function + +* ext/standard/tests/strings/ucwords_basic.phpt + ext/standard/tests/strings/ucwords_basic.phpt + ext/standard/tests/strings/ucwords_error.phpt + ext/standard/tests/strings/ucwords_error.phpt + ext/standard/tests/strings/ucwords_variation1.phpt + ext/standard/tests/strings/ucwords_variation1.phpt + ext/standard/tests/strings/ucwords_variation2.phpt + ext/standard/tests/strings/ucwords_variation2.phpt + ext/standard/tests/strings/ucwords_variation3.phpt + ext/standard/tests/strings/ucwords_variation3.phpt + ext/standard/tests/strings/ucwords_variation4.phpt + ext/standard/tests/strings/ucwords_variation4.phpt: + + New testcases for ucwords() function + +* ext/standard/tests/strings/strncmp_basic.phpt + ext/standard/tests/strings/strncmp_error.phpt + ext/standard/tests/strings/strncmp_variation1.phpt + ext/standard/tests/strings/strncmp_variation2.phpt + ext/standard/tests/strings/strncmp_variation3.phpt + ext/standard/tests/strings/strncmp_variation4.phpt + ext/standard/tests/strings/strncmp_variation5.phpt + ext/standard/tests/strings/strncmp_variation6.phpt + ext/standard/tests/strings/strncmp_variation7.phpt + ext/standard/tests/strings/strncmp_variation8.phpt + ext/standard/tests/strings/strncmp_variation9.phpt: + New testcases for strncmp() function + +* ext/standard/tests/strings/strncmp_basic.phpt + ext/standard/tests/strings/strncmp_basic.phpt + ext/standard/tests/strings/strncmp_error.phpt + ext/standard/tests/strings/strncmp_error.phpt + ext/standard/tests/strings/strncmp_variation1.phpt + ext/standard/tests/strings/strncmp_variation1.phpt + ext/standard/tests/strings/strncmp_variation2.phpt + ext/standard/tests/strings/strncmp_variation2.phpt + ext/standard/tests/strings/strncmp_variation3.phpt + ext/standard/tests/strings/strncmp_variation3.phpt + ext/standard/tests/strings/strncmp_variation4.phpt + ext/standard/tests/strings/strncmp_variation4.phpt + ext/standard/tests/strings/strncmp_variation5.phpt + ext/standard/tests/strings/strncmp_variation5.phpt + ext/standard/tests/strings/strncmp_variation6.phpt + ext/standard/tests/strings/strncmp_variation6.phpt + ext/standard/tests/strings/strncmp_variation7.phpt + ext/standard/tests/strings/strncmp_variation7.phpt + ext/standard/tests/strings/strncmp_variation8.phpt + ext/standard/tests/strings/strncmp_variation8.phpt + ext/standard/tests/strings/strncmp_variation9.phpt + ext/standard/tests/strings/strncmp_variation9.phpt: + + file strncmp_basic.phpt was initially added on branch PHP_5_2. + +2007-09-07 Jani Taskinen [EMAIL PROTECTED] + +* ZendEngine2/zend_ini.c + ZendEngine2/zend_ini.h: + - Make the macro into function (for the sake of idiotic ZEND_STRL() macro) + +* (PHP_5_2) + ZendEngine2/zend_ini.c: + - Can not remove because of the idiotic ZEND_STR*() macros + +2007-09-07 Raghubansh Kumar [EMAIL PROTECTED] + +* ext/standard/tests/strings/stripslashes_basic.phpt + ext/standard/tests/strings/stripslashes_error.phpt + ext/standard/tests/strings/stripslashes_variation1.phpt + ext/standard/tests/strings/stripslashes_variation2.phpt + ext/standard/tests/strings/stripslashes_variation3.phpt + ext/standard/tests/strings/stripslashes_variation4.phpt: + New testcases for stripslashes() function + +* ext/standard/tests/strings/stripslashes_basic.phpt + ext/standard/tests/strings/stripslashes_basic.phpt + ext/standard/tests/strings/stripslashes_error.phpt + ext/standard/tests/strings/stripslashes_error.phpt + ext/standard/tests/strings/stripslashes_variation1.phpt + ext/standard/tests/strings/stripslashes_variation1.phpt + ext/standard/tests/strings/stripslashes_variation2.phpt +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sat Sep 8 01:31:20 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1165r2=1.1166diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1165 ZendEngine2/ChangeLog:1.1166 --- ZendEngine2/ChangeLog:1.1165Thu Sep 6 01:31:22 2007 +++ ZendEngine2/ChangeLog Sat Sep 8 01:31:19 2007 @@ -1,3 +1,38 @@ +2007-09-07 Jani Taskinen [EMAIL PROTECTED] + +* zend_ini.c + zend_ini.h: + - Make the macro into function (for the sake of idiotic ZEND_STRL() macro) + +* (PHP_5_2) + zend_ini.c: + - Can not remove because of the idiotic ZEND_STR*() macros + +* (PHP_5_2) + zend_ini.c: + - Added reminder for 5.3 + +* (PHP_5_2) + zend_ini.c: + - Missed this from previous commit to zend_ini.h + +* (PHP_5_2) + zend_ini.h: + - No need to break binary compatibility here + +* (PHP_5_2) + zend_ini.c + zend_ini.h + zend_vm_def.h + zend_vm_execute.h: + MFH: - Fixed the rest of bug #41561 ( @ operator not working ) + +* zend_ini.c + zend_ini.h + zend_vm_def.h + zend_vm_execute.h: + - Fixed the rest of bug #41561 ( @ operator not working ) + 2007-09-05 Dmitry Stogov [EMAIL PROTECTED] * zend_compile.c: @@ -18869,7 +18904,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1165 2007/09/06 01:31:22 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1166 2007/09/08 01:31:19 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -20593,7 +20628,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1165 2007/09/06 01:31:22 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1166 2007/09/08 01:31:19 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
janiFri Sep 7 09:39:11 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.934r2=1.2027.2.547.2.935diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.934 php-src/NEWS:1.2027.2.547.2.935 --- php-src/NEWS:1.2027.2.547.2.934 Fri Sep 7 08:50:13 2007 +++ php-src/NEWSFri Sep 7 09:39:11 2007 @@ -2,7 +2,7 @@ ||| ?? ??? 20??, PHP 5.2.5 - Fixed leaks with mulitple connects on one mysqli object. (Andrey) -'- Fixed endianness detection on MacOS when building universal binary. +- Fixed endianness detection on MacOS when building universal binary. (Uwe Schindler, Christian Speich, Tony) - Fixed possible triggering of buffer overflows inside glibc imlplementations of the fnmatch(), setlocale() and glob() functions reported @@ -33,6 +33,8 @@ - Fixed bug #42214 (SoapServer sends clients internal PHP errors). (Dmitry) - Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic compliant wsdl). (Dmitry) +- Fixed bug #41561 (Values set with php_admin_* in httpd.conf can be overwritten + with ini_set()). (Stas, Jani) 30 Aug 2007, PHP 5.2.4 - Removed --enable-versioning configure option. (Jani) -- 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 strncmp_basic.phpt strncmp_error.phpt strncmp_variation1.phpt strncmp_variation2.phpt strncmp_variation3.phpt strncmp_variation4.phpt strncmp_variati
kraghubaFri Sep 7 14:22:56 2007 UTC
Modified files:
/php-src/ext/standard/tests/strings strncmp_basic.phpt
strncmp_variation1.phpt
strncmp_variation2.phpt
strncmp_variation3.phpt
strncmp_variation4.phpt
strncmp_variation5.phpt
strncmp_error.phpt
strncmp_variation6.phpt
strncmp_variation7.phpt
strncmp_variation8.phpt
strncmp_variation9.phpt
Log:
New testcases for strncmp() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/strncmp_basic.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/strncmp_basic.phpt:1.2
--- /dev/null Fri Sep 7 14:22:56 2007
+++ php-src/ext/standard/tests/strings/strncmp_basic.phpt Fri Sep 7
14:22:56 2007
@@ -0,0 +1,29 @@
+--TEST--
+Test strncmp() function : basic functionality
+--FILE--
+?php
+/* Prototype : int strncmp ( string $str1, string $str2, int $len );
+ * Description: Binary safe case-sensitive string comparison of the first n
characters
+ * Source code: Zend/zend_builtin_functions.c
+*/
+
+/* Test strncmp() function with all three arguments */
+
+echo *** Test strncmp() function: basic functionality ***\n;
+var_dump( strncmp(Hello, Hello, 5) ); //expected: int(0)
+var_dump( strncmp(Hello, Hi, 5) ); //expected: int(-1)
+var_dump( strncmp(Hi, Hello, 5) ); //expected: int(1)
+echo *** Done ***;
+?
+--EXPECTF--
+*** Test strncmp() function: basic functionality ***
+int(0)
+int(-1)
+int(1)
+*** Done ***
+--UEXPECTF--
+*** Test strncmp() function: basic functionality ***
+int(0)
+int(-1)
+int(1)
+*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/strncmp_variation1.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/strncmp_variation1.phpt:1.2
--- /dev/null Fri Sep 7 14:22:56 2007
+++ php-src/ext/standard/tests/strings/strncmp_variation1.phpt Fri Sep 7
14:22:56 2007
@@ -0,0 +1,245 @@
+--TEST--
+Test strncmp() function: usage variations - different inputs(alphabet
characters)
+--FILE--
+?php
+/* Prototype : int strncmp ( string $str1, string $str2, int $len );
+ * Description: Binary safe case-sensitive string comparison of the first n
characters
+ * Source code: Zend/zend_builtin_functions.c
+*/
+
+/* Test strncmp() function with upper-case and lower-case alphabets as inputs
for 'str1' and 'str2' */
+
+echo *** Test strncmp() function: with chars ***\n;
+echo -- Passing upper-case letters for 'str1' --\n;
+for($ASCII = 65; $ASCII = 90; $ASCII++) {
+ var_dump( strncmp( chr($ASCII), chr($ASCII), 1 ) ); //comparing uppercase
letters with uppercase letters; exp: int(0)
+ var_dump( strncmp( chr($ASCII), chr($ASCII + 32), 1 ) ); //comparing
uppercase letters with lowercase letters; exp: int(-1)
+}
+
+echo \n-- Passing lower-case letters for 'str1' --\n;
+for($ASCII = 97; $ASCII = 122; $ASCII++) {
+ var_dump( strncmp( chr($ASCII), chr($ASCII), 1 ) ); //comparing lowercase
letters with lowercase letters; exp: int(0)
+ var_dump( strncmp( chr($ASCII), chr($ASCII - 32), 1 ) ); //comparing
lowercase letters with uppercase letters; exp: int(1)
+}
+echo *** Done ***\n;
+?
+--EXPECTF--
+*** Test strncmp() function: with chars ***
+-- Passing upper-case letters for 'str1' --
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+
+-- Passing lower-case letters for 'str1' --
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+int(0)
+int(1)
+*** Done ***
+--UEXPECTF--
+*** Test strncmp() function: with chars ***
+-- Passing upper-case letters for 'str1' --
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
+int(0)
+int(-1)
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings strncmp_basic.phpt strncmp_error.phpt strncmp_variation1.phpt strncmp_variation2.phpt strncmp_variation3.phpt strncmp_variation4.phpt strncm
kraghubaFri Sep 7 14:20:12 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings strncmp_basic.phpt strncmp_variation1.phpt strncmp_variation2.phpt strncmp_variation3.phpt strncmp_variation4.phpt strncmp_variation5.phpt strncmp_variation6.phpt strncmp_variation7.phpt strncmp_error.phpt strncmp_variation8.phpt strncmp_variation9.phpt Log: New testcases for strncmp() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_basic.phpt +++ php-src/ext/standard/tests/strings/strncmp_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_variation1.phpt +++ php-src/ext/standard/tests/strings/strncmp_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_variation2.phpt +++ php-src/ext/standard/tests/strings/strncmp_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_variation3.phpt +++ php-src/ext/standard/tests/strings/strncmp_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_variation4.phpt +++ php-src/ext/standard/tests/strings/strncmp_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_variation5.phpt +++ php-src/ext/standard/tests/strings/strncmp_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_variation6.phpt +++ php-src/ext/standard/tests/strings/strncmp_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_variation7.phpt +++ php-src/ext/standard/tests/strings/strncmp_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_error.phpt +++ php-src/ext/standard/tests/strings/strncmp_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation8.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_variation8.phpt +++ php-src/ext/standard/tests/strings/strncmp_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation9.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strncmp_variation9.phpt +++ php-src/ext/standard/tests/strings/strncmp_variation9.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 stripslashes_basic.phpt stripslashes_error.phpt stripslashes_variation1.phpt stripslashes_variation2.phpt stripslashes_variation3.phpt stripslashes_v
kraghubaFri Sep 7 14:03:33 2007 UTC
Modified files:
/php-src/ext/standard/tests/strings stripslashes_variation1.phpt
stripslashes_variation2.phpt
stripslashes_variation3.phpt
stripslashes_basic.phpt
stripslashes_variation4.phpt
stripslashes_error.phpt
Log:
New testcases for stripslashes() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_variation1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/stripslashes_variation1.phpt
diff -u /dev/null
php-src/ext/standard/tests/strings/stripslashes_variation1.phpt:1.2
--- /dev/null Fri Sep 7 14:03:33 2007
+++ php-src/ext/standard/tests/strings/stripslashes_variation1.phpt Fri Sep
7 14:03:33 2007
@@ -0,0 +1,242 @@
+--TEST--
+Test stripslashes() function : usage variations - non-string type argument
+--FILE--
+?php
+/* Prototype : string stripslashes ( string $str )
+ * Description: Returns an un-quoted string
+ * Source code: ext/standard/string.c
+*/
+
+/*
+ * Test stripslashes() with non-string type argument such as int, float, etc
+*/
+
+echo *** Testing stripslashes() : with non-string type argument ***\n;
+// initialize all required variables
+
+// get an unset variable
+$unset_var = 'string_val';
+unset($unset_var);
+
+// declaring a class
+class sample {
+ public function __toString() {
+ return obj\'ct;
+ }
+}
+
+// Defining resource
+$file_handle = fopen(__FILE__, 'r');
+
+// array with different values
+$values = array (
+
+ // integer values
+ 0,
+ 1,
+ 12345,
+ -2345,
+
+ // float values
+ 10.5,
+ -10.5,
+ 10.5e10,
+ 10.6E-10,
+ .5,
+
+ // array values
+ array(),
+ array(0),
+ array(1),
+ array(1, 2),
+ array('color' = 'red', 'item' = 'pen'),
+
+ // boolean values
+ true,
+ false,
+ TRUE,
+ FALSE,
+
+ // empty string
+ ,
+ '',
+
+ // undefined variable
+ $undefined_var,
+
+ // unset variable
+ $unset_var,
+
+ // objects
+ new sample(),
+
+ // resource
+ $file_handle,
+
+ // NULL values
+ NULL,
+ null
+);
+
+
+// loop through each element of the array and check the working of
stripslashes()
+// when $str arugment is supplied with different values
+echo \n--- Testing stripslashes() by supplying different values for 'str'
argument ---\n;
+$counter = 1;
+for($index = 0; $index count($values); $index ++) {
+ echo -- Iteration $counter --\n;
+ $str = $values [$index];
+
+ var_dump( stripslashes($str) );
+
+ $counter ++;
+}
+
+// closing the file
+fclose($file_handle);
+
+echo Done\n;
+?
+--EXPECTF--
+*** Testing stripslashes() : with non-string type argument ***
+
+Notice: Undefined variable: undefined_var in %s on line %d
+
+Notice: Undefined variable: unset_var in %s on line %d
+
+--- Testing stripslashes() by supplying different values for 'str' argument ---
+-- Iteration 1 --
+string(1) 0
+-- Iteration 2 --
+string(1) 1
+-- Iteration 3 --
+string(5) 12345
+-- Iteration 4 --
+string(5) -2345
+-- Iteration 5 --
+string(4) 10.5
+-- Iteration 6 --
+string(5) -10.5
+-- Iteration 7 --
+string(12) 1050
+-- Iteration 8 --
+string(7) 1.06E-9
+-- Iteration 9 --
+string(3) 0.5
+-- Iteration 10 --
+
+Notice: Array to string conversion in %s on line %d
+string(5) Array
+-- Iteration 11 --
+
+Notice: Array to string conversion in %s on line %d
+string(5) Array
+-- Iteration 12 --
+
+Notice: Array to string conversion in %s on line %d
+string(5) Array
+-- Iteration 13 --
+
+Notice: Array to string conversion in %s on line %d
+string(5) Array
+-- Iteration 14 --
+
+Notice: Array to string conversion in %s on line %d
+string(5) Array
+-- Iteration 15 --
+string(1) 1
+-- Iteration 16 --
+string(0)
+-- Iteration 17 --
+string(1) 1
+-- Iteration 18 --
+string(0)
+-- Iteration 19 --
+string(0)
+-- Iteration 20 --
+string(0)
+-- Iteration 21 --
+string(0)
+-- Iteration 22 --
+string(0)
+-- Iteration 23 --
+string(6) obj'ct
+-- Iteration 24 --
+string(14) Resource id #%d
+-- Iteration 25 --
+string(0)
+-- Iteration 26 --
+string(0)
+Done
+
+--UEXPECTF--
+*** Testing stripslashes() : with non-string type argument ***
+
+Notice: Undefined variable: undefined_var in %s on line %d
+
+Notice: Undefined variable: unset_var in %s on line %d
+
+--- Testing stripslashes() by supplying different values for 'str' argument ---
+-- Iteration 1 --
+unicode(1) 0
+-- Iteration 2 --
+unicode(1) 1
+-- Iteration 3 --
+unicode(5) 12345
+-- Iteration 4 --
+unicode(5) -2345
+-- Iteration 5 --
+unicode(4) 10.5
+-- Iteration 6 --
+unicode(5) -10.5
+-- Iteration 7 --
+unicode(12) 1050
+-- Iteration 8 --
+unicode(7) 1.06E-9
+-- Iteration 9 --
+unicode(3) 0.5
+-- Iteration 10 --
+
+Notice: Array to string conversion in %s on line %d
+unicode(5) Array
+-- Iteration 11 --
+
+Notice: Array to string conversion in
[PHP-CVS] cvs: php-src /ext/standard/tests/file fileinode_error.phpt
zoe Fri Sep 7 11:06:48 2007 UTC Modified files: /php-src/ext/standard/tests/filefileinode_error.phpt Log: made equivalent (to php5 test) changes to the expected output. Although this test did originally have the right EXP section http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileinode_error.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/file/fileinode_error.phpt diff -u php-src/ext/standard/tests/file/fileinode_error.phpt:1.2 php-src/ext/standard/tests/file/fileinode_error.phpt:1.3 --- php-src/ext/standard/tests/file/fileinode_error.phpt:1.2Fri May 25 13:50:06 2007 +++ php-src/ext/standard/tests/file/fileinode_error.phptFri Sep 7 11:06:48 2007 @@ -26,37 +26,37 @@ --EXPECTF-- *** Testing error conditions of fileinode() *** -Warning: fileinode(): stat failed for /no/such/file/dir in %s on line %d +Warning: fileinode(): stat failed for /no/such/file/dir in %s on line 10 bool(false) -Warning: fileinode(): stat failed for string in %s on line %d +Warning: fileinode(): stat failed for string in %s on line 13 bool(false) -Warning: fileinode(): stat failed for 100 in %s on line %d +Warning: fileinode(): stat failed for 100 in %s on line 14 bool(false) -Warning: fileinode() expects exactly 1 parameter, 0 given in %s on line %d +Warning: fileinode() expects exactly 1 parameter, 0 given in %s on line 17 NULL -Warning: fileinode() expects exactly 1 parameter, 2 given in %s on line %d +Warning: fileinode() expects exactly 1 parameter, 2 given in %s on line 20 NULL *** Done *** --UEXPECTF-- *** Testing error conditions of fileinode() *** -Warning: fileinode(): stat failed for /no/such/file/dir in %s on line %d +Warning: fileinode(): stat failed for /no/such/file/dir in %s on line 10 bool(false) -Warning: fileinode(): stat failed for string in %s on line %d +Warning: fileinode(): stat failed for string in %s on line 13 bool(false) -Warning: fileinode(): stat failed for 100 in %s on line %d +Warning: fileinode(): stat failed for 100 in %s on line 14 bool(false) -Warning: fileinode() expects exactly 1 parameter, 0 given in %s on line %d +Warning: fileinode() expects exactly 1 parameter, 0 given in %s on line 17 NULL -Warning: fileinode() expects exactly 1 parameter, 2 given in %s on line %d +Warning: fileinode() expects exactly 1 parameter, 2 given in %s on line 20 NULL *** Done *** -- 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 ucwords_basic.phpt ucwords_error.phpt ucwords_variation1.phpt ucwords_variation2.phpt ucwords_variation3.phpt ucwords_variation4.phpt
kraghubaFri Sep 7 14:44:52 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings ucwords_variation1.phpt
ucwords_basic.phpt
ucwords_variation2.phpt
ucwords_variation3.phpt
ucwords_variation4.phpt
ucwords_error.phpt
Log:
New testcases for ucwords() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/ucwords_variation1.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/ucwords_variation1.phpt
+++ php-src/ext/standard/tests/strings/ucwords_variation1.phpt
--TEST--
Test ucwords() function : usage variations - unexpected input values
--FILE--
?php
/* Prototype : string ucwords ( string $str )
* Description: Uppercase the first character of each word in a string
* Source code: ext/standard/string.c
*/
/*
* Test ucwords() by passing different values including scalar and non scalar
values
*/
echo *** Testing ucwords() : usage variations ***\n;
// initialize all required variables
// get an unset variable
$unset_var = 'string_val';
unset($unset_var);
$fp = fopen(__FILE__, r);
class my
{
function __toString() {
return myString;
}
}
// array with different values
$values = array (
// integer values
0,
1,
12345,
-2345,
// hex values
0x10,
0X20,
0xAA,
-0XF5,
// octal values
0123,
-0342,
// float values
10.5,
-10.5,
10.5e10,
10.6E-10,
.5,
// array values
array(),
array(0),
array(1),
array(1, 2),
array('color' = 'red', 'item' = 'pen'),
// boolean values
true,
false,
TRUE,
FALSE,
// objects
new my(),
// empty string
,
'',
//NULL
NULL,
null,
// hex in string
0x123,
'0x123',
0xFF12,
-0xFF12,
// undefined variable
@$undefined_var,
// unset variable
@$unset_var,
// resource variable
$fp
);
// loop through each element of the array and check the working of ucwords()
// when $str arugment is supplied with different values
echo \n--- Testing ucwords() by supplying different values for 'str' argument
---\n;
$counter = 1;
for($index = 0; $index count($values); $index ++) {
echo -- Iteration $counter --\n;
$str = $values [$index];
var_dump( ucwords($str) );
$counter ++;
}
// close the file handle
fclose($fp);
echo Done\n;
?
--EXPECTF--
*** Testing ucwords() : usage variations ***
--- Testing ucwords() by supplying different values for 'str' argument ---
-- Iteration 1 --
string(1) 0
-- Iteration 2 --
string(1) 1
-- Iteration 3 --
string(5) 12345
-- Iteration 4 --
string(5) -2345
-- Iteration 5 --
string(2) 16
-- Iteration 6 --
string(2) 32
-- Iteration 7 --
string(3) 170
-- Iteration 8 --
string(4) -245
-- Iteration 9 --
string(2) 83
-- Iteration 10 --
string(4) -226
-- Iteration 11 --
string(4) 10.5
-- Iteration 12 --
string(5) -10.5
-- Iteration 13 --
string(12) 1050
-- Iteration 14 --
string(7) 1.06E-9
-- Iteration 15 --
string(3) 0.5
-- Iteration 16 --
Warning: ucwords() expects parameter 1 to be string (Unicode or binary), array
given in %s on line %d
NULL
-- Iteration 17 --
Warning: ucwords() expects parameter 1 to be string (Unicode or binary), array
given in %s on line %d
NULL
-- Iteration 18 --
Warning: ucwords() expects parameter 1 to be string (Unicode or binary), array
given in %s on line %d
NULL
-- Iteration 19 --
Warning: ucwords() expects parameter 1 to be string (Unicode or binary), array
given in %s on line %d
NULL
-- Iteration 20 --
Warning: ucwords() expects parameter 1 to be string (Unicode or binary), array
given in %s on line %d
NULL
-- Iteration 21 --
string(1) 1
-- Iteration 22 --
string(0)
-- Iteration 23 --
string(1) 1
-- Iteration 24 --
string(0)
-- Iteration 25 --
string(8) MyString
-- Iteration 26 --
string(0)
-- Iteration 27 --
string(0)
-- Iteration 28 --
string(0)
-- Iteration 29 --
string(0)
-- Iteration 30 --
string(5) 0x123
-- Iteration 31 --
string(5) 0x123
-- Iteration 32 --
string(6) 0xFF12
-- Iteration 33 --
string(7) -0xFF12
-- Iteration 34 --
string(0)
-- Iteration 35 --
string(0)
-- Iteration 36 --
Warning: ucwords() expects parameter 1 to be string (Unicode or binary),
resource given in %s on line %d
NULL
Done
--UEXPECTF--
*** Testing ucwords() : usage variations ***
--- Testing ucwords() by supplying different values for 'str' argument ---
-- Iteration 1 --
unicode(1) 0
-- Iteration 2 --
unicode(1) 1
-- Iteration 3 --
unicode(5) 12345
-- Iteration 4 --
unicode(5) -2345
-- Iteration 5 --
unicode(2) 16
-- Iteration 6 --
unicode(2) 32
-- Iteration 7 --
unicode(3) 170
-- Iteration 8 --
unicode(4) -245
-- Iteration 9 --
unicode(2) 83
-- Iteration 10 --
unicode(4) -226
-- Iteration 11 --
unicode(4) 10.5
-- Iteration 12 --
unicode(5) -10.5
-- Iteration 13 --
unicode(12) 1050
-- Iteration 14 --
unicode(7)
[PHP-CVS] cvs: php-src /ext/standard/tests/strings ucwords_basic.phpt ucwords_error.phpt ucwords_variation1.phpt ucwords_variation2.phpt ucwords_variation3.phpt ucwords_variation4.phpt
kraghubaFri Sep 7 14:43:24 2007 UTC
Added files:
/php-src/ext/standard/tests/strings ucwords_basic.phpt
ucwords_variation1.phpt
ucwords_variation2.phpt
ucwords_variation3.phpt
ucwords_variation4.phpt
ucwords_error.phpt
Log:
New testcases for ucwords() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/ucwords_basic.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/ucwords_basic.phpt
+++ php-src/ext/standard/tests/strings/ucwords_basic.phpt
--TEST--
Test ucwords() function : basic functionality
--FILE--
?php
/* Prototype : string ucwords ( string $str )
* Description: Uppercase the first character of each word in a string
* Source code: ext/standard/string.c
*/
echo *** Testing ucwords() : basic functionality ***\n;
// lines with different whitespace charecter
$str_array = array(
testing ucwords,
'testing ucwords',
'testing\tucwords',
testing\tucwords,
testing\nucwords,
'testing\nucwords',
testing\vucwords,
'testing\vucwords',
testing,
'testing',
' testing',
testing,
testing ucwords,
'testing ucwords',
'testing\rucwords',
testing\rucwords,
'testing\fucwords',
testing\fucwords
);
// loop through the $strings array to test ucwords on each element
$iteration = 1;
for($index = 0; $index count($str_array); $index++) {
echo -- Iteration $iteration --\n;
var_dump( ucwords($str_array[$index]) );
$iteration++;
}
echo Done\n;
?
--EXPECTF--
*** Testing ucwords() : basic functionality ***
-- Iteration 1 --
string(15) Testing Ucwords
-- Iteration 2 --
string(15) Testing Ucwords
-- Iteration 3 --
string(16) Testing\tucwords
-- Iteration 4 --
string(15) Testing Ucwords
-- Iteration 5 --
string(15) Testing
Ucwords
-- Iteration 6 --
string(16) Testing\nucwords
-- Iteration 7 --
string(16) Testing\vucwords
-- Iteration 8 --
string(16) Testing\vucwords
-- Iteration 9 --
string(7) Testing
-- Iteration 10 --
string(7) Testing
-- Iteration 11 --
string(8) Testing
-- Iteration 12 --
string(8) Testing
-- Iteration 13 --
string(16) Testing Ucwords
-- Iteration 14 --
string(16) Testing Ucwords
-- Iteration 15 --
string(16) Testing\rucwords
-- Iteration 16 --
string(15) TestingUcwords
-- Iteration 17 --
string(16) Testing\fucwords
-- Iteration 18 --
string(16) Testing\fucwords
Done
--UEXPECTF--
*** Testing ucwords() : basic functionality ***
-- Iteration 1 --
unicode(15) Testing Ucwords
-- Iteration 2 --
unicode(15) Testing Ucwords
-- Iteration 3 --
unicode(16) Testing\tucwords
-- Iteration 4 --
unicode(15) TestingUcwords
-- Iteration 5 --
unicode(15) Testing
Ucwords
-- Iteration 6 --
unicode(16) Testing\nucwords
-- Iteration 7 --
unicode(16) Testing\vucwords
-- Iteration 8 --
unicode(16) Testing\vucwords
-- Iteration 9 --
unicode(7) Testing
-- Iteration 10 --
unicode(7) Testing
-- Iteration 11 --
unicode(8) Testing
-- Iteration 12 --
unicode(8) Testing
-- Iteration 13 --
unicode(16) Testing Ucwords
-- Iteration 14 --
unicode(16) Testing Ucwords
-- Iteration 15 --
unicode(16) Testing\rucwords
-- Iteration 16 --
unicode(15) TestingUcwords
-- Iteration 17 --
unicode(16) Testing\fucwords
-- Iteration 18 --
unicode(16) Testing\fucwords
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/ucwords_variation1.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/ucwords_variation1.phpt
+++ php-src/ext/standard/tests/strings/ucwords_variation1.phpt
--TEST--
Test ucwords() function : usage variations - unexpected input values
--FILE--
?php
/* Prototype : string ucwords ( string $str )
* Description: Uppercase the first character of each word in a string
* Source code: ext/standard/string.c
*/
/*
* Test ucwords() by passing different values including scalar and non scalar
values
*/
echo *** Testing ucwords() : usage variations ***\n;
// initialize all required variables
// get an unset variable
$unset_var = 'string_val';
unset($unset_var);
$fp = fopen(__FILE__, r);
class my
{
function __toString() {
return myString;
}
}
// array with different values
$values = array (
// integer values
0,
1,
12345,
-2345,
// hex values
0x10,
0X20,
0xAA,
-0XF5,
// octal values
0123,
-0342,
// float values
10.5,
-10.5,
10.5e10,
10.6E-10,
.5,
// array values
array(),
array(0),
array(1),
array(1, 2),
array('color' = 'red', 'item' = 'pen'),
// boolean values
true,
false,
TRUE,
FALSE,
// objects
new my(),
// empty string
,
'',
//NULL
NULL,
null,
// hex in string
0x123,
'0x123',
0xFF12,
-0xFF12,
// undefined variable
@$undefined_var,
// unset variable
@$unset_var,
// resource variable
$fp
);
// loop through each element of the array and check the working of
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings stripslashes_basic.phpt stripslashes_error.phpt stripslashes_variation1.phpt stripslashes_variation2.phpt stripslashes_variation3.phpt strip
kraghubaFri Sep 7 13:51:27 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings stripslashes_variation1.phpt stripslashes_basic.phpt stripslashes_variation2.phpt stripslashes_variation3.phpt stripslashes_variation4.phpt stripslashes_variation5.phpt stripslashes_error.phpt Log: New testcases for stripslashes() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/stripslashes_variation1.phpt +++ php-src/ext/standard/tests/strings/stripslashes_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/stripslashes_basic.phpt +++ php-src/ext/standard/tests/strings/stripslashes_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/stripslashes_variation2.phpt +++ php-src/ext/standard/tests/strings/stripslashes_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/stripslashes_variation3.phpt +++ php-src/ext/standard/tests/strings/stripslashes_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/stripslashes_variation4.phpt +++ php-src/ext/standard/tests/strings/stripslashes_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/stripslashes_variation5.phpt +++ php-src/ext/standard/tests/strings/stripslashes_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/stripslashes_error.phpt +++ php-src/ext/standard/tests/strings/stripslashes_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) /ext/standard/tests/file fileinode_error.phpt
zoe Fri Sep 7 10:28:04 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filefileinode_error.phpt Log: fixing error in expected output http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fileinode_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/file/fileinode_error.phpt diff -u php-src/ext/standard/tests/file/fileinode_error.phpt:1.1.2.1 php-src/ext/standard/tests/file/fileinode_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/fileinode_error.phpt:1.1.2.1Fri May 25 13:44:23 2007 +++ php-src/ext/standard/tests/file/fileinode_error.phptFri Sep 7 10:28:03 2007 @@ -26,16 +26,19 @@ --EXPECTF-- *** Testing error conditions of fileinode() *** -Warning: fileinode(): stat failed for /no/such/file/dir in %s on line %d +Warning: fileinode(): stat failed for /no/such/file/dir in %s on line 10 bool(false) -Warning: fileinode(): stat failed for string in %s on line %d +Warning: fileinode(): stat failed for string in %s on line 13 bool(false) -Warning: Wrong parameter count for fileinode() in %s on line %d +Warning: fileinode(): stat failed for 100 in %s on line 14 +bool(false) + +Warning: Wrong parameter count for fileinode() in %s on line 17 NULL -Warning: Wrong parameter count for fileinode() in %s on line %d +Warning: Wrong parameter count for fileinode() in %s on line 20 NULL *** Done *** -- 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
janiFri Sep 7 08:50:13 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.933r2=1.2027.2.547.2.934diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.933 php-src/NEWS:1.2027.2.547.2.934
--- php-src/NEWS:1.2027.2.547.2.933 Fri Sep 7 02:28:42 2007
+++ php-src/NEWSFri Sep 7 08:50:13 2007
@@ -11,6 +11,7 @@
- Upgraded PCRE to version 7.3 (Nuno)
- Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
+- Fixed bug #42579 (apache_reset_timeout() does not exist). (Jani)
- 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) /sapi/apache php_apache.c
janiFri Sep 7 08:49:24 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apachephp_apache.c
Log:
MFH:- Fixed bug #42579 (apache_reset_timeout() does not exist)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.89.2.4.2.5r2=1.89.2.4.2.6diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.89.2.4.2.5
php-src/sapi/apache/php_apache.c:1.89.2.4.2.6
--- php-src/sapi/apache/php_apache.c:1.89.2.4.2.5 Sat Feb 24 02:17:28 2007
+++ php-src/sapi/apache/php_apache.cFri Sep 7 08:49:24 2007
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.89.2.4.2.5 2007/02/24 02:17:28 helly Exp $ */
+/* $Id: php_apache.c,v 1.89.2.4.2.6 2007/09/07 08:49:24 jani Exp $ */
#include php_apache_http.h
@@ -64,8 +64,9 @@
PHP_FE(apache_child_terminate, NULL)
PHP_FE(apache_setenv,
NULL)
PHP_FE(apache_response_headers, NULL)
- PHP_FE(apache_get_version, NULL)
- PHP_FE(apache_get_modules, NULL)
+ PHP_FE(apache_get_version,
NULL)
+ PHP_FE(apache_get_modules,
NULL)
+ PHP_FE(apache_reset_timeout,NULL)
PHP_FALIAS(getallheaders, apache_request_headers, NULL)
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi fastcgi.c
dmitry Fri Sep 7 08:30:11 2007 UTC
Modified files:
/php-src/sapi/cgi fastcgi.c
Log:
Added checks for malformated FastCGI requests (Mattias Bengtsson)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.40r2=1.41diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.40 php-src/sapi/cgi/fastcgi.c:1.41
--- php-src/sapi/cgi/fastcgi.c:1.40 Mon Jul 9 11:48:53 2007
+++ php-src/sapi/cgi/fastcgi.c Fri Sep 7 08:30:10 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.40 2007/07/09 11:48:53 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.41 2007/09/07 08:30:10 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -620,7 +620,8 @@
val_len |= (*p++ 8);
val_len |= *p++;
}
- if (p + name_len + val_len end) {
+ if (name_len + val_len 0 ||
+ name_len + val_len end - p) {
/* Malformated request */
ret = 0;
break;
@@ -676,6 +677,10 @@
padding = hdr.paddingLength;
}
+ if (len + padding FCGI_MAX_LENGTH) {
+ return 0;
+ }
+
req-id = (hdr.requestIdB1 8) + hdr.requestIdB0;
if (hdr.type == FCGI_BEGIN_REQUEST len ==
sizeof(fcgi_begin_request)) {
--
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) /sapi/cgi fastcgi.c
dmitry Fri Sep 7 08:26:48 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi fastcgi.c
Log:
Added checks for malformated FastCGI requests (Mattias Bengtsson)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.27r2=1.4.2.13.2.28diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.27
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.28
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.27Mon Jul 9 11:48:39 2007
+++ php-src/sapi/cgi/fastcgi.c Fri Sep 7 08:26:47 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.27 2007/07/09 11:48:39 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.28 2007/09/07 08:26:47 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -620,7 +620,8 @@
val_len |= (*p++ 8);
val_len |= *p++;
}
- if (p + name_len + val_len end) {
+ if (name_len + val_len 0 ||
+ name_len + val_len end - p) {
/* Malformated request */
ret = 0;
break;
@@ -676,6 +677,10 @@
padding = hdr.paddingLength;
}
+ if (len + padding FCGI_MAX_LENGTH) {
+ return 0;
+ }
+
req-id = (hdr.requestIdB1 8) + hdr.requestIdB0;
if (hdr.type == FCGI_BEGIN_REQUEST len ==
sizeof(fcgi_begin_request)) {
@@ -712,6 +717,10 @@
padding = hdr.paddingLength;
while (hdr.type == FCGI_PARAMS len 0) {
+ if (len + padding FCGI_MAX_LENGTH) {
+ return 0;
+ }
+
if (safe_read(req, buf, len+padding) != len+padding) {
req-keep = 0;
return 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache php_apache.c
janiFri Sep 7 08:49:07 2007 UTC
Modified files:
/php-src/sapi/apachephp_apache.c
Log:
- Fixed bug #42579 (apache_reset_timeout() does not exist)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.100r2=1.101diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.100
php-src/sapi/apache/php_apache.c:1.101
--- php-src/sapi/apache/php_apache.c:1.100 Mon Jan 1 09:29:36 2007
+++ php-src/sapi/apache/php_apache.cFri Sep 7 08:49:07 2007
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.100 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.101 2007/09/07 08:49:07 jani Exp $ */
#include php_apache_http.h
@@ -64,8 +64,9 @@
PHP_FE(apache_child_terminate, NULL)
PHP_FE(apache_setenv,
NULL)
PHP_FE(apache_response_headers, NULL)
- PHP_FE(apache_get_version, NULL)
- PHP_FE(apache_get_modules, NULL)
+ PHP_FE(apache_get_version,
NULL)
+ PHP_FE(apache_get_modules,
NULL)
+ PHP_FE(apache_reset_timeout,NULL)
PHP_FALIAS(getallheaders, apache_request_headers, NULL)
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi fastcgi.c
dmitry Fri Sep 7 08:42:33 2007 UTC
Modified files:
/php-src/sapi/cgi fastcgi.c
Log:
forgotten part
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.41r2=1.42diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.41 php-src/sapi/cgi/fastcgi.c:1.42
--- php-src/sapi/cgi/fastcgi.c:1.41 Fri Sep 7 08:30:10 2007
+++ php-src/sapi/cgi/fastcgi.c Fri Sep 7 08:42:33 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.41 2007/09/07 08:30:10 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.42 2007/09/07 08:42:33 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -717,6 +717,10 @@
padding = hdr.paddingLength;
while (hdr.type == FCGI_PARAMS len 0) {
+ if (len + padding FCGI_MAX_LENGTH) {
+ return 0;
+ }
+
if (safe_read(req, buf, len+padding) != len+padding) {
req-keep = 0;
return 0;
--
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 string.c
pajoye Fri Sep 7 18:23:58 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard string.c
Log:
- #42592, remove ending dot in warning msg
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.68r2=1.445.2.14.2.69diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.68
php-src/ext/standard/string.c:1.445.2.14.2.69
--- php-src/ext/standard/string.c:1.445.2.14.2.68 Fri Sep 7 02:28:42 2007
+++ php-src/ext/standard/string.c Fri Sep 7 18:23:58 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.68 2007/09/07 02:28:42 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69 2007/09/07 18:23:58 pajoye Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -659,7 +659,7 @@
}
if (linelength == 0 docut) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Can't force cut
when width is zero.);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Can't force cut
when width is zero);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
philip Sat Sep 8 01:06:37 2007 UTC Modified files: /CVSROOTavail Log: phpdoc karma for Paul Reinheimer (preinheimer) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1301r2=1.1302diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1301 CVSROOT/avail:1.1302 --- CVSROOT/avail:1.1301Thu Aug 30 02:10:37 2007 +++ CVSROOT/avail Sat Sep 8 01:06:37 2007 @@ -44,7 +44,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief97! 7,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodiv! e,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,ti x,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhit! ama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,lsmith,tessus,gavinfo,rant,colder,ramsey,arkadius,bjori,erinet,omar,sixd,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,gwynne,mkoppanen,ron,nicobn,jacques,void,mcbrown,simionea|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de! ,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc -hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no
