Author: keescook-guest Date: 2007-04-24 20:17:27 +0000 (Tue, 24 Apr 2007) New Revision: 5726 Modified: data/mopb.txt data/patches/MOPB/MOPB-14-php5.diff Log: updated php5 matrix for ubuntu; added testcase changes for MOPB 14 (substr_compare) Modified: data/mopb.txt ==================================================================--- data/mopb.txt 2007-04-24 17:07:54 UTC (rev 5725) +++ data/mopb.txt 2007-04-24 20:17:27 UTC (rev 5726) @@ -196,25 +196,25 @@ / = not affected # PHP5 checklist.... -MOPB Etch, Unstable Dapper, Edgy, Feisty PATCH -10 p p[3] X X a * -14 X T X X a * -15 i T X X - * -16 p p - - - -17 - - - - - -18 X T - - - -19 X T - - - -22 X T X X a * -23 X T[5] X X X ? -24 i i X X a * -26 X T X X a * -29 - - - - a * -30 - a[4] X X - * -34 X a X X a * -41 X T X X a [1] ! -42 X a X X - * -44 X a - - - -45 X T - - a [2] ! +MOPB Etch, Unstable Dapper, Edgy, Feisty, Gutsy PATCH +10 p p[3] T T T - * +14 X T T T T - * +15 i T T T - - * +16 p p - - - - +17 - - - - - - +18 X T - - - - +19 X T - - - - +22 X T T T T - * +23 X T[5] X X X - ? +24 i i T T T X * +26 X T T T T - * +29 - - - - T - * +30 - a[4] T T - - * +34 X a T T T - * +41 X T T T T - ![1] +42 X a T T - - * +44 X a - - - - +45 X T - - T - ![2] * = patch extracted from upstream ? = no upstream patch found Modified: data/patches/MOPB/MOPB-14-php5.diff ==================================================================--- data/patches/MOPB/MOPB-14-php5.diff 2007-04-24 17:07:54 UTC (rev 5725) +++ data/patches/MOPB/MOPB-14-php5.diff 2007-04-24 20:17:27 UTC (rev 5726) @@ -1,4 +1,5 @@ # http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.45&r2=1.445.2.14.2.49&pathrev=PHP_5_2&view=patch +# http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/substr_compare.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&pathrev=PHP_5_2&view=patch --- php-src/ext/standard/string.c 2007/03/03 15:46:29 1.445.2.14.2.45 +++ php-src/ext/standard/string.c 2007/03/08 00:47:04 1.445.2.14.2.49 @@ -4642,18 +4642,20 @@ @@ -40,3 +41,15 @@ RETURN_FALSE; } +diff -uNrp php5-5.1.6-unpatched/ext/standard/tests/strings/substr_compare.phpt php5-5.1.6/ext/standard/string.c +--- php5-5.1.6-unpatched/ext/standard/tests/strings/substr_compare.phpt 2007-04-23 16:12:26.000000000 -0700 ++++ php5-5.1.6/ext/standard/tests/strings/substr_compare.phpt 2007-04-23 16:16:15.000000000 -0700 +@@ -24,7 +24,7 @@ + int(1) + int(-1) + +-Warning: substr_compare(): The start position cannot exceed initial string length in %s on line %d ++Warning: substr_compare(): The length cannot exceed initial string length in %s on line %d + bool(false) + + Warning: substr_compare() expects parameter 5 to be boolean, object given in %s on line %d