[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/gd/tests/imagesetthickness_basic.phpt branches/PHP_5_2/ext/gd/tests/imagesetthickness_error1.phpt branches/PHP_5_2/ext/gd/tests/imagesetthickness_erro
rdohms Fri, 24 Jul 2009 03:06:05 + Revision: http://svn.php.net/viewvc?view=revision&revision=284678 Log: Adding tests for imagesetthickness, basic and errors for both params, and complementing imagetruecolortopalette with out of bound params Changed paths: A php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_basic.phpt A php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error1.phpt A php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error2.phpt A php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error4.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_basic.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error1.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error2.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/imagetruecolortopalette_error4.phpt A php/php-src/trunk/ext/gd/tests/imagesetthickness_basic.phpt A php/php-src/trunk/ext/gd/tests/imagesetthickness_error1.phpt A php/php-src/trunk/ext/gd/tests/imagesetthickness_error2.phpt A php/php-src/trunk/ext/gd/tests/imagetruecolortopalette_error4.phpt Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_basic.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_basic.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_basic.phpt 2009-07-24 03:06:05 UTC (rev 284678) @@ -0,0 +1,34 @@ +--TEST-- +Testing imagetruecolortopalette() of GD library +--CREDITS-- +Rafael Dohms +--SKIPIF-- + +--FILE-- + +--EXPECT-- +93c3077f1bdc372cd0b0db96db282985 \ No newline at end of file Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error1.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error1.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error1.phpt 2009-07-24 03:06:05 UTC (rev 284678) @@ -0,0 +1,22 @@ +--TEST-- +Testing imagetruecolortopalette(): wrong types for first parameter +--CREDITS-- +Rafael Dohms +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: imagesetthickness(): supplied argument is not a valid Image resource in %s on line %d + +Warning: imagesetthickness(): supplied argument is not a valid Image resource in %s on line %d + +Warning: imagesetthickness(): supplied resource is not a valid Image resource in %s on line %d \ No newline at end of file Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error2.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error2.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error2.phpt 2009-07-24 03:06:05 UTC (rev 284678) @@ -0,0 +1,24 @@ +--TEST-- +Testing imagetruecolortopalette(): wrong types for second parameter +--CREDITS-- +Rafael Dohms +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +bool(true) +bool(true) +bool(true) \ No newline at end of file Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error4.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error4.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error4.phpt 2009-07-24 03:06:05 UTC (rev 284678) @@ -0,0 +1,21 @@ +--TEST-- +Testing imagetruecolortopalette(): out of range parameter 3 +--CREDITS-- +Rafael Dohms +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: imagetruecolortopalette(): Number of colors has to be greater than zero in %s on line %d + +Warning: imagetruecolortopalette(): Number of colors has to be greater than zero in %s on line %d \ No newline at end of file Added: php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_basic.phpt === --- php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_basic.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_basic.phpt 2009-07-24 03:06:05 UTC (rev 284678) @@ -0,0 +1,34 @@ +--TEST-- +Testing imagetruecolortopalette() of GD library +--CREDITS-- +Rafael Dohms +--SKIPIF-- + +--FILE-- + +--EXPECT-- +93c3077f1bdc372cd0b0db96db282985 \ No newline at end of file Added: php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error1.phpt === --- php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error1.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error1.phpt 2009-07-24 03:06:05 UTC (rev 284678) @@ -0,0 +1,22 @@ +--TEST-- +Testing imag
[PHP-CVS] svn: /php/php-src/trunk/ext/phar/phar/ pharcommand.inc
cellog Fri, 24 Jul 2009 02:04:52 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284677
Log:
fix unmerged syntax fix
Changed paths:
U php/php-src/trunk/ext/phar/phar/pharcommand.inc
Modified: php/php-src/trunk/ext/phar/phar/pharcommand.inc
===
--- php/php-src/trunk/ext/phar/phar/pharcommand.inc 2009-07-24 02:03:24 UTC
(rev 284676)
+++ php/php-src/trunk/ext/phar/phar/pharcommand.inc 2009-07-24 02:04:52 UTC
(rev 284677)
@@ -217,7 +217,7 @@
$pear = false;
foreach ($path as $component) {
if (file_exists($component .
DIRECTORY_SEPARATOR . 'pear')
- && is_executable($component .
DIRECTORY_SEPARATOR . 'pear'))) {
+ && is_executable($component .
DIRECTORY_SEPARATOR . 'pear')) {
$pear = true;
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/tests/basic/ 022.phpt 023.phpt
felipe Fri, 24 Jul 2009 00:36:58 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284673
Log:
- Fixed bug #49042 (Patch for fixing tests/basic/022.phpt and 023.phpt)
patch by: mats dot lindh at gmail dot com
Bug: http://bugs.php.net/49042 (Open) Patch for fixing tests/basic/022.phpt and
023.phpt
Changed paths:
U php/php-src/trunk/tests/basic/022.phpt
U php/php-src/trunk/tests/basic/023.phpt
Modified: php/php-src/trunk/tests/basic/022.phpt
===
--- php/php-src/trunk/tests/basic/022.phpt 2009-07-24 00:11:28 UTC (rev
284672)
+++ php/php-src/trunk/tests/basic/022.phpt 2009-07-24 00:36:58 UTC (rev
284673)
@@ -9,7 +9,7 @@
--EXPECTF--
array(10) {
[u"cookie1"]=>
- unicode(0) ""
+ unicode(6) "val1 "
[u"cookie2"]=>
unicode(5) "val2 "
[u"cookie3"]=>
Modified: php/php-src/trunk/tests/basic/023.phpt
===
--- php/php-src/trunk/tests/basic/023.phpt 2009-07-24 00:11:28 UTC (rev
284672)
+++ php/php-src/trunk/tests/basic/023.phpt 2009-07-24 00:36:58 UTC (rev
284673)
@@ -9,7 +9,7 @@
--EXPECT--
array(3) {
[u"c_o_o_k_i_e"]=>
- unicode(1) "v"
+ unicode(5) "value"
[u"name"]=>
unicode(24) ""value","value",UEhQIQ=="
[u"UEhQIQ"]=>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/ext/standard/tests/strings/chunk_split_variation2.phpt PHP_5_2/ext/standard/tests/strings/chunk_split_variation5.phpt PHP_5_2/ext/standard/tests/strings/c
jani Thu, 23 Jul 2009 19:06:56 + Revision: http://svn.php.net/viewvc?view=revision&revision=284665 Log: - Fixed tests to be more portable Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation2.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation5.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation8.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation2.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation5.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation8.phpt Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation2.phpt === --- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation2.phpt 2009-07-23 17:39:21 UTC (rev 284664) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation2.phpt 2009-07-23 19:06:56 UTC (rev 284665) @@ -35,10 +35,10 @@ // float data 10.5, -10.5, - 10.1234567e10, - 10.7654321E-10, + (float) PHP_INT_MAX + 1, + (float) -PHP_INT_MAX - 1, .5, - + // array data array(), array(0), @@ -95,23 +95,23 @@ string(28) "This is ch*uklen vari*ation*" -- Iteration 2 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 3 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 4 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 5 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 6 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 7 -- string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" @@ -123,52 +123,52 @@ string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" -- Iteration 11 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 12 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 13 -- string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" -- Iteration 14 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 15 -- string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" -- Iteration 16 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 17 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 18 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 19 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 20 -- -Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 21 -- -Notice: Object of class MyClass could not be converted to int in %s on line %d +Notice: Object of class MyClass could not be converted to int in %schunk_split_variation2.php on line %d string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" -- Iteration 22 --
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/standard/ string.c
jani Thu, 23 Jul 2009 17:39:21 + Revision: http://svn.php.net/viewvc?view=revision&revision=284664 Log: - Allow using huge values for chunklen in this branch too Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/string.c Modified: php/php-src/branches/PHP_5_2/ext/standard/string.c === --- php/php-src/branches/PHP_5_2/ext/standard/string.c 2009-07-23 17:38:03 UTC (rev 284663) +++ php/php-src/branches/PHP_5_2/ext/standard/string.c 2009-07-23 17:39:21 UTC (rev 284664) @@ -2183,7 +2183,7 @@ char *result; char *end= "\r\n"; int endlen = 2; - int chunklen = 76; + long chunklen = 76; int result_len; int argc = ZEND_NUM_ARGS(); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/
jani Thu, 23 Jul 2009 17:38:03 + Revision: http://svn.php.net/viewvc?view=revision&revision=284663 Log: - Add missing svn:ignore property Changed paths: _U php/php-src/branches/PHP_5_3/ext/mysql/tests/ _U php/php-src/branches/PHP_5_3/tests/lang/ Property changes on: php/php-src/branches/PHP_5_3/ext/mysql/tests ___ Added: svn:ignore + phpt.* *.mem *.diff *.log *.exp *.out *.php *.gcda *.gcno Property changes on: php/php-src/branches/PHP_5_3/tests/lang ___ Added: svn:ignore + phpt.* *.mem *.diff *.log *.exp *.out *.php *.gcda *.gcno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / pecl/phar/trunk/package.php pecl/phar/trunk/phar_object.c pecl/phar/trunk/tests/bug48377.2.phpt pecl/phar/trunk/tests/bug48377.phpt php/php-src/branches/PHP_5_3/NEWS php/php-src/branc
cellog Thu, 23 Jul 2009 17:04:24 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284660
Log:
fix PHP Bug #48377: error message unclear on converting phar with existing file
Bug: http://bugs.php.net/48377 (Closed) error message unclear on converting
phar with existing file
Changed paths:
U pecl/phar/trunk/package.php
U pecl/phar/trunk/phar_object.c
A pecl/phar/trunk/tests/bug48377.2.phpt
A pecl/phar/trunk/tests/bug48377.phpt
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
A php/php-src/branches/PHP_5_3/ext/phar/tests/bug48377.2.phpt
A php/php-src/branches/PHP_5_3/ext/phar/tests/bug48377.phpt
U php/php-src/trunk/ext/phar/phar_object.c
A php/php-src/trunk/ext/phar/tests/bug48377.2.phpt
A php/php-src/trunk/ext/phar/tests/bug48377.phpt
Modified: pecl/phar/trunk/package.php
===
--- pecl/phar/trunk/package.php 2009-07-23 16:40:47 UTC (rev 284659)
+++ pecl/phar/trunk/package.php 2009-07-23 17:04:24 UTC (rev 284660)
@@ -52,6 +52,7 @@
fixed PHP Bug #48783: make install will fail saying phar file exists
fixed PHP Bug #48740: PHAR install fails when INSTALL_ROOT is not the final install location
fixed PHP Bug #48681: openssl signature verification for tar archives broken
+ fixed PHP Bug #48377: error message unclear on converting phar with existing file
fixed isset() on sub-directories (isset("blah") if file "blah/foo.php" exists)
Changes since 2.0.0RC1:
security vulnerability in handling of long tar filenames fixed
Modified: pecl/phar/trunk/phar_object.c
===
--- pecl/phar/trunk/phar_object.c 2009-07-23 16:40:47 UTC (rev 284659)
+++ pecl/phar/trunk/phar_object.c 2009-07-23 17:04:24 UTC (rev 284660)
@@ -2043,6 +2043,7 @@
int ext_len = ext ? strlen(ext) : 0;
int oldname_len;
phar_archive_data **pphar = NULL;
+ php_stream_statbuf ssb;
if (!ext) {
if (phar->is_zip) {
@@ -2113,6 +2114,8 @@
spprintf(&newname, 0, "%s.%s", strtok(basename, "."), ext);
efree(basename);
+
+
basepath = estrndup(oldpath, (strlen(oldpath) - oldname_len));
phar->fname_len = spprintf(&newpath, 0, "%s%s", basepath, newname);
phar->fname = newpath;
@@ -2148,6 +2151,11 @@
return NULL;
}
its_ok:
+ if (SUCCESS == php_stream_stat_path(newpath, &ssb)) {
+ efree(oldpath);
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "phar \"%s\" exists and must be unlinked prior to conversion", newpath);
+ return NULL;
+ }
if (!phar->is_data) {
if (SUCCESS != phar_detect_phar_fname_ext(newpath, phar->fname_len, (const char **) &(phar->ext), &(phar->ext_len), 1, 1, 1 TSRMLS_CC)) {
efree(oldpath);
Added: pecl/phar/trunk/tests/bug48377.2.phpt
===
--- pecl/phar/trunk/tests/bug48377.2.phpt (rev 0)
+++ pecl/phar/trunk/tests/bug48377.2.phpt 2009-07-23 17:04:24 UTC (rev 284660)
@@ -0,0 +1,25 @@
+--TEST--
+Phar: PHP bug #48377 "error message unclear on converting phar with existing file" test #2
+--SKIPIF--
+
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+convertToData(Phar::ZIP, Phar::NONE, '.2.phar.zip');
+} catch (BadMethodCallException $e) {
+ echo $e->getMessage(),"\n";
+}
+?>
+===DONE===
+--CLEAN--
+
+--EXPECTF--
+data phar "%sbug48377.2.phar.zip" has invalid extension 2.phar.zip
+===DONE===
\ No newline at end of file
Added: pecl/phar/trunk/tests/bug48377.phpt
===
--- pecl/phar/trunk/tests/bug48377.phpt (rev 0)
+++ pecl/phar/trunk/tests/bug48377.phpt 2009-07-23 17:04:24 UTC (rev 284660)
@@ -0,0 +1,29 @@
+--TEST--
+Phar: PHP bug #48377 "error message unclear on converting phar with existing file"
+--SKIPIF--
+
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+convertToData(Phar::ZIP, Phar::NONE, 'zip');
+} catch (BadMethodCallException $e) {
+ echo $e->getMessage(),"\n";
+}
+?>
+===DONE===
+--CLEAN--
+
+
+--EXPECTF--
+phar "%sbug48377.zip" exists and must be unlinked prior to conversion
+===DONE===
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-23 16:40:47 UTC (rev 284659)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-23 17:04:24 UTC (rev 284660)
@@ -43,6 +43,8 @@
components). (Ilia)
- Fixed bug #48681 (openssl signature verification for tar archives broken).
(Greg)
+- Fixed bug #48377 (error message unclear on converting phar with existing file).
+ (Greg)
- Fixed bug #48247 (Infinite loop and possible crash during startup with
errors when errors are logged). (Jani)
- Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre,
Modified: php/php-src/branches/PHP_5_3
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Thu, 23 Jul 2009 17:06:43 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284661
Log:
fix the issue with non-confluent parent paths (multi-project commits)
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-23 17:04:24 UTC (rev 284660)
+++ SVNROOT/commit-email.php2009-07-23 17:06:43 UTC (rev 284661)
@@ -118,7 +118,7 @@
//
-
// Build list of e-mail addresses and parent changed path
$emails_to = array();
-$parent_path = $commit_info['dirs_changed'][0];
+$parent_path = '/' . $commit_info['dirs_changed'][0];
foreach ($commit_info['dirs_changed'] as $changed_path) {
foreach ($commit_email_list as $regex => $email_list) {
@@ -127,12 +127,13 @@
break;
}
}
-if ($changed_path === '/') {
-$parent_path = '';
-} else {
-$parent_path = common_prefix($parent_path, $changed_path);
-}
+$parent_path = common_prefix($parent_path, '/' . ($changed_path === '/' ?
'' : $changed_path));
}
+$parent_path = dirname($parent_path . '~');
+if ($parent_path !== '/') {
+$parent_path .= '/';
+}
+
if (count($emails_to) === 0) {
$emails_to = $fallback_addresses;
}
@@ -162,11 +163,11 @@
//
-
// Process changed paths
-$paths_list = $parent_path === '' ? '/' : $parent_path;
+$paths_list = $parent_path;
foreach ($commit_info['changed_paths'] as $changed_path) {
$changed_path = trim(strstr($changed_path, ' '));
if (substr($changed_path, -1) !== '/') {
-$paths_list .= ' ' . substr($changed_path, strlen($parent_path));
+$paths_list .= ' ' . substr($changed_path, strlen($parent_path) - 1);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: p ecl/phar/trunk/package.php ecl/phar/trunk/phar_object.c ecl/phar/trunk/tests/bug48377.2.phpt ecl/phar/trunk/tests/bug48377.phpt hp/php-src/branches/PHP_5_3/NEWS hp/php-src/branches/PH
cellog Thu, 23 Jul 2009 17:04:24 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284660
Log:
fix PHP Bug #48377: error message unclear on converting phar with existing file
Bug: http://bugs.php.net/48377 (Open) error message unclear on converting phar
with existing file
Changed paths:
U pecl/phar/trunk/package.php
U pecl/phar/trunk/phar_object.c
A pecl/phar/trunk/tests/bug48377.2.phpt
A pecl/phar/trunk/tests/bug48377.phpt
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
A php/php-src/branches/PHP_5_3/ext/phar/tests/bug48377.2.phpt
A php/php-src/branches/PHP_5_3/ext/phar/tests/bug48377.phpt
U php/php-src/trunk/ext/phar/phar_object.c
A php/php-src/trunk/ext/phar/tests/bug48377.2.phpt
A php/php-src/trunk/ext/phar/tests/bug48377.phpt
Modified: pecl/phar/trunk/package.php
===
--- pecl/phar/trunk/package.php 2009-07-23 16:40:47 UTC (rev 284659)
+++ pecl/phar/trunk/package.php 2009-07-23 17:04:24 UTC (rev 284660)
@@ -52,6 +52,7 @@
fixed PHP Bug #48783: make install will fail saying phar file exists
fixed PHP Bug #48740: PHAR install fails when INSTALL_ROOT is not the final install location
fixed PHP Bug #48681: openssl signature verification for tar archives broken
+ fixed PHP Bug #48377: error message unclear on converting phar with existing file
fixed isset() on sub-directories (isset("blah") if file "blah/foo.php" exists)
Changes since 2.0.0RC1:
security vulnerability in handling of long tar filenames fixed
Modified: pecl/phar/trunk/phar_object.c
===
--- pecl/phar/trunk/phar_object.c 2009-07-23 16:40:47 UTC (rev 284659)
+++ pecl/phar/trunk/phar_object.c 2009-07-23 17:04:24 UTC (rev 284660)
@@ -2043,6 +2043,7 @@
int ext_len = ext ? strlen(ext) : 0;
int oldname_len;
phar_archive_data **pphar = NULL;
+ php_stream_statbuf ssb;
if (!ext) {
if (phar->is_zip) {
@@ -2113,6 +2114,8 @@
spprintf(&newname, 0, "%s.%s", strtok(basename, "."), ext);
efree(basename);
+
+
basepath = estrndup(oldpath, (strlen(oldpath) - oldname_len));
phar->fname_len = spprintf(&newpath, 0, "%s%s", basepath, newname);
phar->fname = newpath;
@@ -2148,6 +2151,11 @@
return NULL;
}
its_ok:
+ if (SUCCESS == php_stream_stat_path(newpath, &ssb)) {
+ efree(oldpath);
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "phar \"%s\" exists and must be unlinked prior to conversion", newpath);
+ return NULL;
+ }
if (!phar->is_data) {
if (SUCCESS != phar_detect_phar_fname_ext(newpath, phar->fname_len, (const char **) &(phar->ext), &(phar->ext_len), 1, 1, 1 TSRMLS_CC)) {
efree(oldpath);
Added: pecl/phar/trunk/tests/bug48377.2.phpt
===
--- pecl/phar/trunk/tests/bug48377.2.phpt (rev 0)
+++ pecl/phar/trunk/tests/bug48377.2.phpt 2009-07-23 17:04:24 UTC (rev 284660)
@@ -0,0 +1,25 @@
+--TEST--
+Phar: PHP bug #48377 "error message unclear on converting phar with existing file" test #2
+--SKIPIF--
+
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+convertToData(Phar::ZIP, Phar::NONE, '.2.phar.zip');
+} catch (BadMethodCallException $e) {
+ echo $e->getMessage(),"\n";
+}
+?>
+===DONE===
+--CLEAN--
+
+--EXPECTF--
+data phar "%sbug48377.2.phar.zip" has invalid extension 2.phar.zip
+===DONE===
\ No newline at end of file
Added: pecl/phar/trunk/tests/bug48377.phpt
===
--- pecl/phar/trunk/tests/bug48377.phpt (rev 0)
+++ pecl/phar/trunk/tests/bug48377.phpt 2009-07-23 17:04:24 UTC (rev 284660)
@@ -0,0 +1,29 @@
+--TEST--
+Phar: PHP bug #48377 "error message unclear on converting phar with existing file"
+--SKIPIF--
+
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+convertToData(Phar::ZIP, Phar::NONE, 'zip');
+} catch (BadMethodCallException $e) {
+ echo $e->getMessage(),"\n";
+}
+?>
+===DONE===
+--CLEAN--
+
+
+--EXPECTF--
+phar "%sbug48377.zip" exists and must be unlinked prior to conversion
+===DONE===
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-23 16:40:47 UTC (rev 284659)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-23 17:04:24 UTC (rev 284660)
@@ -43,6 +43,8 @@
components). (Ilia)
- Fixed bug #48681 (openssl signature verification for tar archives broken).
(Greg)
+- Fixed bug #48377 (error message unclear on converting phar with existing file).
+ (Greg)
- Fixed bug #48247 (Infinite loop and possible crash during startup with
errors when errors are logged). (Jani)
- Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre,
Modified: php/php-src/branches/PHP_5_3/e
[PHP-CVS] svn: p ecl/phar/trunk/tests/zip/bug48791.phpt ecl/phar/trunk/tests/zip/files/test.odt hp/php-src/branches/PHP_5_3/ext/phar/tests/zip/bug48791.phpt hp/php-src/branches/PHP_5_3/ext/phar/tests/
cellog Thu, 23 Jul 2009 16:40:47 + Revision: http://svn.php.net/viewvc?view=revision&revision=284659 Log: new phar test for zip with data descriptor in local file header Changed paths: A pecl/phar/trunk/tests/zip/bug48791.phpt A pecl/phar/trunk/tests/zip/files/test.odt A php/php-src/branches/PHP_5_3/ext/phar/tests/zip/bug48791.phpt A php/php-src/branches/PHP_5_3/ext/phar/tests/zip/files/test.odt A php/php-src/trunk/ext/phar/tests/zip/bug48791.phpt A php/php-src/trunk/ext/phar/tests/zip/files/test.odt Added: pecl/phar/trunk/tests/zip/bug48791.phpt === --- pecl/phar/trunk/tests/zip/bug48791.phpt (rev 0) +++ pecl/phar/trunk/tests/zip/bug48791.phpt 2009-07-23 16:40:47 UTC (rev 284659) @@ -0,0 +1,15 @@ +--TEST-- +Phar: Bug #48791: open office documents always reported as corrupted by phar extension +--SKIPIF-- + + + +--FILE-- + +===DONE=== +--EXPECT-- + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:rdfa="http://docs.oasis-open.org/opendocument/meta/rdfa#"; office:version="1.2">ÃberschriftName:$$n_fn$$Firma:$$org_name$$Menge:$$#menge$$ +===DONE=== Added: pecl/phar/trunk/tests/zip/files/test.odt === (Binary files differ) Property changes on: pecl/phar/trunk/tests/zip/files/test.odt ___ Added: svn:mime-type + application/octet-stream Added: php/php-src/branches/PHP_5_3/ext/phar/tests/zip/bug48791.phpt === --- php/php-src/branches/PHP_5_3/ext/phar/tests/zip/bug48791.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/zip/bug48791.phpt 2009-07-23 16:40:47 UTC (rev 284659) @@ -0,0 +1,15 @@ +--TEST-- +Phar: Bug #48791: open office documents always reported as corrupted by phar extension +--SKIPIF-- + + + +--FILE-- + +===DONE=== +--EXPECT-- + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:rdfa="http://docs.oasis-open.org/opendocument/meta/rdfa#"; office:version="1.2">ÃberschriftName:$$n_fn$$Firma:$$org_name$$Menge:$$#menge$$ +===DONE=== Added: php/php-src/branches/PHP_5_3/ext/phar/tests/zip/files/test.odt === (Binary files differ) Property changes on: php/php-src/branches/PHP_5_3/ext/phar/tests/zip/files/test.odt ___ Added: svn:mime-type + application/octet-stream Added: php/php-src/trunk/ext/phar/tests/zip/bug48791.phpt === --- php/php-src/trunk/ext/phar/tests/zip/bug48791.phpt (rev 0) +++ php/php-src/trunk/ext/phar/tests/zip/bug48791.phpt 2009-07-23 16:40:47 UTC (rev 284659) @@ -0,0 +1,15 @@ +--TEST-- +Phar: Bug #48791: open office documents always reported as corrupted by phar extension +--SKIPIF-- + + + +--FILE
[PHP-CVS] svn: p ecl/phar/trunk/package.php ecl/phar/trunk/phar.c ecl/phar/trunk/pharzip.h hp/php-src/branches/PHP_5_3/NEWS hp/php-src/branches/PHP_5_3/ext/phar/phar.c hp/php-src/branches/PHP_5_3/ext/
cellog Thu, 23 Jul 2009 16:30:27 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284658
Log:
fix PHP bug #48791: open office files always reported as corrupted
Bug: http://bugs.php.net/48791 (Open) open office files always reported as
corrupted
Changed paths:
U pecl/phar/trunk/package.php
U pecl/phar/trunk/phar.c
U pecl/phar/trunk/pharzip.h
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/phar/phar.c
U php/php-src/branches/PHP_5_3/ext/phar/pharzip.h
U php/php-src/trunk/ext/phar/phar.c
U php/php-src/trunk/ext/phar/pharzip.h
Modified: pecl/phar/trunk/package.php
===
--- pecl/phar/trunk/package.php 2009-07-23 16:28:17 UTC (rev 284657)
+++ pecl/phar/trunk/package.php 2009-07-23 16:30:27 UTC (rev 284658)
@@ -48,6 +48,7 @@
getSignature() call
fixed PHP Bug #49020: phar misinterprets ustar long filename standard
fixed PHP Bug #49018: phar tar stores long filenames with prefix/name reversed
+ fixed PHP Bug #48791: open office files always reported as corrupted
fixed PHP Bug #48783: make install will fail saying phar file exists
fixed PHP Bug #48740: PHAR install fails when INSTALL_ROOT is not the final install location
fixed PHP Bug #48681: openssl signature verification for tar archives broken
Modified: pecl/phar/trunk/phar.c
===
--- pecl/phar/trunk/phar.c 2009-07-23 16:28:17 UTC (rev 284657)
+++ pecl/phar/trunk/phar.c 2009-07-23 16:30:27 UTC (rev 284658)
@@ -2407,6 +2407,7 @@
if (entry->is_zip && process_zip > 0) {
/* verify local file header */
phar_zip_file_header local;
+ phar_zip_data_desc desc;
if (SUCCESS != phar_open_archive_fp(idata->phar TSRMLS_CC)) {
spprintf(error, 0, "phar error: unable to open zip-based phar archive \"%s\" to verify local file header for file \"%s\"", idata->phar->fname, entry->filename);
@@ -2420,6 +2421,25 @@
return FAILURE;
}
+ /* check for data descriptor */
+ if (((PHAR_ZIP_16(local.flags)) & 0x8) == 0x8) {
+ php_stream_seek(phar_get_entrypfp(idata->internal_file TSRMLS_CC),
+ entry->header_offset + sizeof(local) +
+ PHAR_ZIP_16(local.filename_len) +
+ PHAR_ZIP_16(local.extra_len) +
+ entry->compressed_filesize, SEEK_SET);
+ if (sizeof(desc) != php_stream_read(phar_get_entrypfp(idata->internal_file TSRMLS_CC),
+ (char *) &desc, sizeof(desc))) {
+spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (cannot read local data descriptor for file \"%s\")", idata->phar->fname, entry->filename);
+return FAILURE;
+ }
+ if (desc.signature[0] == 'P' && desc.signature[1] == 'K') {
+memcpy(&(local.crc32), &(desc.crc32), 12);
+ } else {
+/* old data descriptors have no signature */
+memcpy(&(local.crc32), &desc, 12);
+ }
+ }
/* verify local header */
if (entry->filename_len != PHAR_ZIP_16(local.filename_len) || entry->crc32 != PHAR_ZIP_32(local.crc32) || entry->uncompressed_filesize != PHAR_ZIP_32(local.uncompsize) || entry->compressed_filesize != PHAR_ZIP_32(local.compsize)) {
spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (local header of file \"%s\" does not match central directory)", idata->phar->fname, entry->filename);
Modified: pecl/phar/trunk/pharzip.h
===
--- pecl/phar/trunk/pharzip.h 2009-07-23 16:28:17 UTC (rev 284657)
+++ pecl/phar/trunk/pharzip.h 2009-07-23 16:30:27 UTC (rev 284658)
@@ -37,6 +37,7 @@
/* unused in this release */
typedef struct _phar_zip_file_datadesc {
+ char signature[4]; /* signature (optional)4 bytes */
char crc32[4]; /* crc-32 4 bytes */
char compsize[4]; /* compressed size 4 bytes */
char uncompsize[4]; /* uncompressed size 4 bytes */
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-23 16:28:17 UTC (rev 284657)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-23 16:30:27 UTC (rev 284658)
@@ -26,6 +26,7 @@
- Fixed bug #48854 (array_merge_recursive modifies arrays after first one).
(Felipe)
- Fixed bug #48802 (printf() returns incorrect outputted length). (Jani)
+- Fixed bug #48791 (open office files always reported as corrupted). (Greg)
- Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked
directories). (Ilia)
- Fixed bug #48783 (make install will fail saying phar file exists). (Greg)
Modified: php/php-src/branches/PHP_5_3/ext/phar/phar.c
===
--- php/php-src/branches/PHP_5_3/ext/phar/phar.c 2009-07-23 16:28:17 UTC (rev 284657)
+++ php/php-src/branches/PHP_5_3/ext/phar/phar.c 2009-07-23 16:30:27
[PHP-CVS] svn: php/php-src/trunk/ext/standard/tests/strings/ chunk_split_variation4.phpt
jani Thu, 23 Jul 2009 16:28:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=284657 Log: - Fix test Changed paths: UU php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation4.phpt Modified: php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation4.phpt === --- php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation4.phpt 2009-07-23 16:25:07 UTC (rev 284656) +++ php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation4.phpt 2009-07-23 16:28:17 UTC (rev 284657) @@ -145,7 +145,7 @@ () E scap -e +e ch ars " Property changes on: php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation4.phpt ___ Deleted: svn:eol-style - native -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ chunk_split_variation4.phpt
jani Thu, 23 Jul 2009 16:25:07 + Revision: http://svn.php.net/viewvc?view=revision&revision=284656 Log: - Fix test Changed paths: UU php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation4.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation4.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation4.phpt 2009-07-23 16:24:24 UTC (rev 284655) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation4.phpt 2009-07-23 16:25:07 UTC (rev 284656) @@ -146,7 +146,7 @@ () E scap -e +e ch ars " Property changes on: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation4.phpt ___ Deleted: svn:eol-style - native -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/ chunk_split_variation4.phpt
jani Thu, 23 Jul 2009 16:24:24 + Revision: http://svn.php.net/viewvc?view=revision&revision=284655 Log: - Fix test Changed paths: UU php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation4.phpt Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation4.phpt === --- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation4.phpt 2009-07-23 16:15:17 UTC (rev 284654) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation4.phpt 2009-07-23 16:24:24 UTC (rev 284655) @@ -146,7 +146,7 @@ () E scap -e +e ch ars " Property changes on: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation4.phpt ___ Deleted: svn:eol-style - native -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
gwynne Thu, 23 Jul 2009 15:55:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284653
Log:
fix case-sensitivity problem in bug matcher
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-23 15:48:04 UTC (rev 284652)
+++ SVNROOT/commit-bugs.php 2009-07-23 15:55:12 UTC (rev 284653)
@@ -25,7 +25,7 @@
//
-
// Pick the default bug project out the of the path in the first changed dir
-switch (substr($commit_info['dirs_changed'][0], 0, 4)) {
+switch (strtolower(substr($commit_info['dirs_changed'][0], 0, 4))) {
case 'pear':
$bug_project_default = 'pear';
break;
@@ -42,7 +42,7 @@
$bug_list = array();
foreach ($matched_bugs as $matched_bug) {
$bug = array();
-$bug['project'] = $matched_bug[1] === "" ? $bug_project_default :
$matched_bug[1];
+$bug['project'] = $matched_bug[1] === "" ? $bug_project_default :
strtolower($matched_bug[1]);
$bug['number'] = intval($matched_bug[2]);
$bugid = $bug['project'] . $bug['number'];
$bug['url_prefix'] = isset($bug_url_prefixes[$bug['project']]) ?
$bug_url_prefixes[$bug['project']] : $bug_url_prefixes[''];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: p ecl/phar/trunk/Makefile.frag ecl/phar/trunk/package.php hp/php-src/branches/PHP_5_3/NEWS hp/php-src/branches/PHP_5_3/ext/phar/Makefile.frag hp/php-src/trunk/ext/phar/Makefile.frag
cellog Thu, 23 Jul 2009 15:48:04 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284652
Log:
fix php bug #48783: make install will fail saying phar file exists
Bug: http://bugs.php.net/48783 (Open) make install will fail saying phar file
exists
Changed paths:
U pecl/phar/trunk/Makefile.frag
U pecl/phar/trunk/package.php
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag
U php/php-src/trunk/ext/phar/Makefile.frag
Modified: pecl/phar/trunk/Makefile.frag
===
--- pecl/phar/trunk/Makefile.frag 2009-07-23 15:40:10 UTC (rev 284651)
+++ pecl/phar/trunk/Makefile.frag 2009-07-23 15:48:04 UTC (rev 284652)
@@ -43,4 +43,5 @@
install-pharcmd: pharcmd
-...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
+ -...@rm -f $(INSTALL_ROOT)$(bindir)/phar
$(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
Modified: pecl/phar/trunk/package.php
===
--- pecl/phar/trunk/package.php 2009-07-23 15:40:10 UTC (rev 284651)
+++ pecl/phar/trunk/package.php 2009-07-23 15:48:04 UTC (rev 284652)
@@ -48,6 +48,7 @@
getSignature() call
fixed PHP Bug #49020: phar misinterprets ustar long filename standard
fixed PHP Bug #49018: phar tar stores long filenames with prefix/name reversed
+ fixed PHP Bug #48783: make install will fail saying phar file exists
fixed PHP Bug #48740: PHAR install fails when INSTALL_ROOT is not the final
install location
fixed PHP Bug #48681: openssl signature verification for tar archives broken
fixed isset() on sub-directories (isset("blah") if file "blah/foo.php" exists)
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-23 15:40:10 UTC (rev 284651)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-23 15:48:04 UTC (rev 284652)
@@ -28,6 +28,7 @@
- Fixed bug #48802 (printf() returns incorrect outputted length). (Jani)
- Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked
directories). (Ilia)
+- Fixed bug #48783 (make install will fail saying phar file exists). (Greg)
- Fixed bug #48771 (rename() between volumes fails and reports no error on
Windows). (Pierre)
- Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at
Modified: php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag
===
--- php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag 2009-07-23 15:40:10 UTC
(rev 284651)
+++ php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag 2009-07-23 15:48:04 UTC
(rev 284652)
@@ -43,4 +43,5 @@
install-pharcmd: pharcmd
-...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
+ -...@rm -f $(INSTALL_ROOT)$(bindir)/phar
$(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
Modified: php/php-src/trunk/ext/phar/Makefile.frag
===
--- php/php-src/trunk/ext/phar/Makefile.frag2009-07-23 15:40:10 UTC (rev
284651)
+++ php/php-src/trunk/ext/phar/Makefile.frag2009-07-23 15:48:04 UTC (rev
284652)
@@ -43,4 +43,5 @@
install-pharcmd: pharcmd
-...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
+ -...@rm -f $(INSTALL_ROOT)$(bindir)/phar
$(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: p ecl/phar/trunk/Makefile.frag ecl/phar/trunk/package.php hp/php-src/branches/PHP_5_3/NEWS hp/php-src/branches/PHP_5_3/ext/phar/Makefile.frag hp/php-src/trunk/ext/phar/Makefile.frag
cellog Thu, 23 Jul 2009 15:40:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284651
Log:
fix PHP bug #48740: PHAR install fails when INSTALL_ROOT is not the final
install location
Bug: http://bugs.php.net/48740 (unknown)
Changed paths:
U pecl/phar/trunk/Makefile.frag
U pecl/phar/trunk/package.php
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag
U php/php-src/trunk/ext/phar/Makefile.frag
Modified: pecl/phar/trunk/Makefile.frag
===
--- pecl/phar/trunk/Makefile.frag 2009-07-23 15:16:08 UTC (rev 284650)
+++ pecl/phar/trunk/Makefile.frag 2009-07-23 15:40:10 UTC (rev 284651)
@@ -43,4 +43,4 @@
install-pharcmd: pharcmd
-...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
- $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar
$(INSTALL_ROOT)$(bindir)/phar
+ $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
Modified: pecl/phar/trunk/package.php
===
--- pecl/phar/trunk/package.php 2009-07-23 15:16:08 UTC (rev 284650)
+++ pecl/phar/trunk/package.php 2009-07-23 15:40:10 UTC (rev 284651)
@@ -48,6 +48,7 @@
getSignature() call
fixed PHP Bug #49020: phar misinterprets ustar long filename standard
fixed PHP Bug #49018: phar tar stores long filenames with prefix/name reversed
+ fixed PHP Bug #48740: PHAR install fails when INSTALL_ROOT is not the final
install location
fixed PHP Bug #48681: openssl signature verification for tar archives broken
fixed isset() on sub-directories (isset("blah") if file "blah/foo.php" exists)
Changes since 2.0.0RC1:
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-23 15:16:08 UTC (rev 284650)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-23 15:40:10 UTC (rev 284651)
@@ -33,6 +33,8 @@
- Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at
gmail dot com, Pierre)
- Fixed bug #48757 (ReflectionFunction::invoke() parameter issues). (Kalle)
+- Fixed bug #48740 (PHAR install fails when INSTALL_ROOT is not the final
install
+ location). (james dot cohen at digitalwindow dot com, Greg)
- Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on
files that have been opened with r+). (Ilia)
- Fixed bug #48718 (FILTER_VALIDATE_EMAIL does not allow numbers in domain
Modified: php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag
===
--- php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag 2009-07-23 15:16:08 UTC
(rev 284650)
+++ php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag 2009-07-23 15:40:10 UTC
(rev 284651)
@@ -43,4 +43,4 @@
install-pharcmd: pharcmd
-...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
- $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar
$(INSTALL_ROOT)$(bindir)/phar
+ $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
Modified: php/php-src/trunk/ext/phar/Makefile.frag
===
--- php/php-src/trunk/ext/phar/Makefile.frag2009-07-23 15:16:08 UTC (rev
284650)
+++ php/php-src/trunk/ext/phar/Makefile.frag2009-07-23 15:40:10 UTC (rev
284651)
@@ -43,4 +43,4 @@
install-pharcmd: pharcmd
-...@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
- $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar
$(INSTALL_ROOT)$(bindir)/phar
+ $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/ addcslashes_001.phpt
jani Thu, 23 Jul 2009 15:16:08 + Revision: http://svn.php.net/viewvc?view=revision&revision=284650 Log: - fix test Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addcslashes_001.phpt Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addcslashes_001.phpt === --- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addcslashes_001.phpt 2009-07-23 14:54:04 UTC (rev 284649) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addcslashes_001.phpt 2009-07-23 15:16:08 UTC (rev 284650) @@ -48,7 +48,7 @@ Notice: Array to string conversion in %s on line %d string(42) "good\ye\a\r12345NULL - + " -- Iteration 4 -- string(39) "goodye\ar12345NULL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/formatted_print.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/formatted_prin
jani Thu, 23 Jul 2009 14:54:04 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284649
Log:
- Fixed bug #48802 (printf() returns incorrect outputted length)
Bug: http://bugs.php.net/48802 (Assigned) printf() returns incorrect outputted
length
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/standard/formatted_print.c
U php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/formatted_print.c
U php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
U php/php-src/trunk/ext/standard/formatted_print.c
U php/php-src/trunk/sapi/cli/php_cli.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-07-23 14:42:46 UTC (rev 284648)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-23 14:54:04 UTC (rev 284649)
@@ -13,6 +13,7 @@
option is an array). (David Zülke)
- Fixed bug #48913 (Too long error code strings in pdo_odbc driver).
(naf at altlinux dot ru, Felipe)
+- Fixed bug #48802 (printf() returns incorrect outputted length). (Jani)
- Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked
directories). (Ilia)
- Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at
Modified: php/php-src/branches/PHP_5_2/ext/standard/formatted_print.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/formatted_print.c 2009-07-23
14:42:46 UTC (rev 284648)
+++ php/php-src/branches/PHP_5_2/ext/standard/formatted_print.c 2009-07-23
14:54:04 UTC (rev 284649)
@@ -700,14 +700,14 @@
PHP_FUNCTION(user_printf)
{
char *result;
- int len;
+ int len, rlen;
if ((result=php_formatted_print(ht, &len, 0, 0 TSRMLS_CC))==NULL) {
RETURN_FALSE;
}
- PHPWRITE(result, len);
+ rlen = PHPWRITE(result, len);
efree(result);
- RETURN_LONG(len);
+ RETURN_LONG(rlen);
}
/* }}} */
@@ -716,14 +716,14 @@
PHP_FUNCTION(vprintf)
{
char *result;
- int len;
+ int len, rlen;
if ((result=php_formatted_print(ht, &len, 1, 0 TSRMLS_CC))==NULL) {
RETURN_FALSE;
}
- PHPWRITE(result, len);
+ rlen = PHPWRITE(result, len);
efree(result);
- RETURN_LONG(len);
+ RETURN_LONG(rlen);
}
/* }}} */
Modified: php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c
===
--- php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c 2009-07-23 14:42:46 UTC
(rev 284648)
+++ php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c 2009-07-23 14:54:04 UTC
(rev 284649)
@@ -298,7 +298,7 @@
remaining -= ret;
}
- return str_length;
+ return (ptr - str);
}
/* }}} */
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-23 14:42:46 UTC (rev 284648)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-23 14:54:04 UTC (rev 284649)
@@ -14,17 +14,18 @@
(Greg)
- Fixed bug #49018 (phar tar stores long filenames wit prefix/name reversed).
(Greg)
+- Fixed bug #49014 (dechunked filter broken when serving more than 8192 bytes
in
+ a chunk). (andreas dot streichardt at globalpark dot com, Ilia)
- Fixed bug #48962 (cURL does not upload files with specified filename).
(Ilia)
- Fixed bug #48929 (Double \r\n after HTTP headers when "header" context
option is an array). (David Zülke)
-- Fixed bug #49014 (dechunked filter broken when serving more than 8192 bytes
in
- a chunk) (andreas dot streichardt at globalpark dot com, Ilia)
- Fixed bug #48899 (is_callable returns true even if method does not exist in
parent class). (Felipe)
- Fixed bug #48893 (Problems compiling with Curl). (Felipe)
- Fixed bug #48854 (array_merge_recursive modifies arrays after first one).
(Felipe)
+- Fixed bug #48802 (printf() returns incorrect outputted length). (Jani)
- Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked
directories). (Ilia)
- Fixed bug #48771 (rename() between volumes fails and reports no error on
Modified: php/php-src/branches/PHP_5_3/ext/standard/formatted_print.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/formatted_print.c 2009-07-23
14:42:46 UTC (rev 284648)
+++ php/php-src/branches/PHP_5_3/ext/standard/formatted_print.c 2009-07-23
14:54:04 UTC (rev 284649)
@@ -697,14 +697,14 @@
PHP_FUNCTION(user_printf)
{
char *result;
- int len;
+ int len, rlen;
if ((result=php_formatted_print(ht, &len, 0, 0 TSRMLS_CC))==NULL) {
RETURN_FALSE;
}
- PHPWRITE(result,
[PHP-CVS] svn: php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/spl/spl_directory.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_directory.c trunk/ext/spl/spl_directory.c
jani Thu, 23 Jul 2009 14:42:46 + Revision: http://svn.php.net/viewvc?view=revision&revision=284648 Log: - Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference) Bug: http://bugs.php.net/49032 (Verified) SplFileObject::fscanf pass-by-reference values Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c U php/php-src/trunk/ext/spl/spl_directory.c Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-07-23 13:45:59 UTC (rev 284647) +++ php/php-src/branches/PHP_5_2/NEWS 2009-07-23 14:42:46 UTC (rev 284648) @@ -4,6 +4,8 @@ - Fixed regression in cURL extension that prevented flush of data to output defined as a file handle. (Ilia) +- Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference). + (Jani) - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe) - Fixed bug #48962 (cURL does not upload files with specified filename). (Ilia) Modified: php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c === --- php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c2009-07-23 13:45:59 UTC (rev 284647) +++ php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c2009-07-23 14:42:46 UTC (rev 284648) @@ -2264,8 +2264,9 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 1, 0, 1) ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(1, ...) ZEND_END_ARG_INFO() static Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-07-23 13:45:59 UTC (rev 284647) +++ php/php-src/branches/PHP_5_3/NEWS 2009-07-23 14:42:46 UTC (rev 284648) @@ -6,6 +6,8 @@ - Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz, Stas) +- Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference). + (Jani) - Fixed bug #49012 (phar tar signature algorithm reports as Unknown (0) in getSignature() call). (Greg) - Fixed bug #49020 (phar misinterprets ustar long filename standard). Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c === --- php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c2009-07-23 13:45:59 UTC (rev 284647) +++ php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c2009-07-23 14:42:46 UTC (rev 284648) @@ -2567,8 +2567,9 @@ ZEND_ARG_INFO(0, allowable_tags) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 1, 0, 1) ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(1, ...) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fwrite, 0, 0, 1) Modified: php/php-src/trunk/ext/spl/spl_directory.c === --- php/php-src/trunk/ext/spl/spl_directory.c 2009-07-23 13:45:59 UTC (rev 284647) +++ php/php-src/trunk/ext/spl/spl_directory.c 2009-07-23 14:42:46 UTC (rev 284648) @@ -2696,8 +2696,9 @@ ZEND_ARG_INFO(0, allowable_tags) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 1, 0, 1) ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(1, ...) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fwrite, 0, 0, 1) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/filters.c trunk/ext/standard/filters.c
iliaaThu, 23 Jul 2009 12:18:40 + Revision: http://svn.php.net/viewvc?view=revision&revision=284646 Log: Fixed bug #49014 (dechunked filter broken when serving more than 8192 bytes in a chunk) # Original patch by andreas dot streichardt at globalpark dot com Bug: http://bugs.php.net/49014 (Open) dechunked filter broken when serving more than 8192 bytes in a chunk Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/standard/filters.c U php/php-src/trunk/ext/standard/filters.c Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-07-23 11:49:41 UTC (rev 284645) +++ php/php-src/branches/PHP_5_3/NEWS 2009-07-23 12:18:40 UTC (rev 284646) @@ -16,6 +16,8 @@ (Ilia) - Fixed bug #48929 (Double \r\n after HTTP headers when "header" context option is an array). (David Zülke) +- Fixed bug #49014 (dechunked filter broken when serving more than 8192 bytes in + a chunk) (andreas dot streichardt at globalpark dot com, Ilia) - Fixed bug #48899 (is_callable returns true even if method does not exist in parent class). (Felipe) - Fixed bug #48893 (Problems compiling with Curl). (Felipe) Modified: php/php-src/branches/PHP_5_3/ext/standard/filters.c === --- php/php-src/branches/PHP_5_3/ext/standard/filters.c 2009-07-23 11:49:41 UTC (rev 284645) +++ php/php-src/branches/PHP_5_3/ext/standard/filters.c 2009-07-23 12:18:40 UTC (rev 284646) @@ -2007,6 +2007,7 @@ memmove(out, p, end - p); } data->chunk_size -= end - p; + data->state=CHUNK_BODY; out_len += end - p; return out_len; } Modified: php/php-src/trunk/ext/standard/filters.c === --- php/php-src/trunk/ext/standard/filters.c2009-07-23 11:49:41 UTC (rev 284645) +++ php/php-src/trunk/ext/standard/filters.c2009-07-23 12:18:40 UTC (rev 284646) @@ -2088,6 +2088,7 @@ memmove(out, p, end - p); } data->chunk_size -= end - p; + data->state=CHUNK_BODY; out_len += end - p; return out_len; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/phpruntests/trunk/ src/configuration/rtCommandLineOptions.php src/configuration/rtIniAsCommandLineArgs.php src/configuration/rtPreConditionList.php src/rtText.php src/testcase/rtPhp
spriebschThu, 23 Jul 2009 11:32:38 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284642
Log:
Switched remaining exceptions to rtException.
Changed paths:
U php/phpruntests/trunk/src/configuration/rtCommandLineOptions.php
U php/phpruntests/trunk/src/configuration/rtIniAsCommandLineArgs.php
U php/phpruntests/trunk/src/configuration/rtPreConditionList.php
U php/phpruntests/trunk/src/rtText.php
U php/phpruntests/trunk/src/testcase/rtPhpRunner.php
U
php/phpruntests/trunk/src/testcase/sections/executablesections/rtCleanSection.php
U
php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileSection.php
U
php/phpruntests/trunk/src/testcase/sections/executablesections/rtSkipIfSection.php
U php/phpruntests/trunk/src/testcase/sections/rtSection.php
U php/phpruntests/trunk/tests/configuration/rtCommandLineOptionsTest.php
U php/phpruntests/trunk/tests/configuration/rtIniAsCommandLineArgsTest.php
U php/phpruntests/trunk/tests/testcase/sections/rtSectionTest.php
Modified: php/phpruntests/trunk/src/configuration/rtCommandLineOptions.php
===
--- php/phpruntests/trunk/src/configuration/rtCommandLineOptions.php 2009-07-23 11:14:57 UTC (rev 284641)
+++ php/phpruntests/trunk/src/configuration/rtCommandLineOptions.php 2009-07-23 11:32:38 UTC (rev 284642)
@@ -156,7 +156,7 @@
}
if (!in_array($option, array_merge($this->shortOptions, $this->shortOptionsWithArgs, $this->longOptions, $this->longOptionsWithArgs))) {
-throw new rtUnknownOptionException('Unknown option ' . $argv[$i]);
+throw new rtException('Unknown option ' . $argv[$i]);
}
if (in_array($option, array_merge($this->shortOptions, $this->longOptions))) {
@@ -165,7 +165,7 @@
}
if (!$this->isValidOptionArg($argv, $i + 1)) {
-throw new rtMissingArgumentException('Missing argument for command line option ' . $argv[$i]);
+throw new rtException('Missing argument for command line option ' . $argv[$i]);
}
$i++;
Modified: php/phpruntests/trunk/src/configuration/rtIniAsCommandLineArgs.php
===
--- php/phpruntests/trunk/src/configuration/rtIniAsCommandLineArgs.php 2009-07-23 11:14:57 UTC (rev 284641)
+++ php/phpruntests/trunk/src/configuration/rtIniAsCommandLineArgs.php 2009-07-23 11:32:38 UTC (rev 284642)
@@ -68,7 +68,7 @@
$setting = $this->stripSpaces($setting);
$args .= " -d \"$setting\"";
} else {
-throw new rtUnknownIniSettingException("Invalid INI setting $setting");
+throw new rtException("Invalid INI setting $setting");
}
}
Modified: php/phpruntests/trunk/src/configuration/rtPreConditionList.php
===
--- php/phpruntests/trunk/src/configuration/rtPreConditionList.php 2009-07-23 11:14:57 UTC (rev 284641)
+++ php/phpruntests/trunk/src/configuration/rtPreConditionList.php 2009-07-23 11:32:38 UTC (rev 284642)
@@ -54,7 +54,7 @@
$p = new $preCon;
if (!$p->check($config)) {
-throw new Exception($p->getMessage());
+throw new rtException($p->getMessage());
}
}
Modified: php/phpruntests/trunk/src/rtText.php
===
--- php/phpruntests/trunk/src/rtText.php 2009-07-23 11:14:57 UTC (rev 284641)
+++ php/phpruntests/trunk/src/rtText.php 2009-07-23 11:32:38 UTC (rev 284642)
@@ -29,7 +29,7 @@
$filename = dirname(__FILE__) . '/texts/' . $name . '.txt';
if (!file_exists($filename)) {
-throw new LogicException('The text ' . $name . ' does not exist');
+throw new rtException('The text ' . $name . ' does not exist');
}
$text = file_get_contents($filename);
Modified: php/phpruntests/trunk/src/testcase/rtPhpRunner.php
===
--- php/phpruntests/trunk/src/testcase/rtPhpRunner.php 2009-07-23 11:14:57 UTC (rev 284641)
+++ php/phpruntests/trunk/src/testcase/rtPhpRunner.php 2009-07-23 11:32:38 UTC (rev 284642)
@@ -49,7 +49,7 @@
);
if (!$proc) {
-throw new rtPhpRunnerException('Failed to open process to run PHP code in rtPhpRunner');
+throw new rtException('Failed to open process to run PHP code in rtPhpRunner');
}
if (!is_null($this->stdin)) {
@@ -67,10 +67,10 @@
$n = @stream_select($r, $w, $e, $this->timeOut);
if ($n === false) {
-throw new rtPhpRunnerException('Stream select failure in rtPhpRunner');
+throw new rtException('St
[PHP-CVS] svn: php/cmake/trunk/
gloobThu, 23 Jul 2009 10:28:00 + Revision: http://svn.php.net/viewvc?view=revision&revision=284640 Log: - This is not needed anymore. Changed paths: D php/cmake/trunk/patches/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/cmake/trunk/ README scripts/co_php5.sh scripts/co_php6.sh
gloobThu, 23 Jul 2009 09:36:47 + Revision: http://svn.php.net/viewvc?view=revision&revision=284639 Log: Added svn:external property to fetch php-src/trunk source code. Erasing scripts to obtain PHP source code. Changed paths: U php/cmake/trunk/README D php/cmake/trunk/scripts/co_php5.sh D php/cmake/trunk/scripts/co_php6.sh _U php/cmake/trunk/src/ Modified: php/cmake/trunk/README === --- php/cmake/trunk/README 2009-07-23 08:38:12 UTC (rev 284638) +++ php/cmake/trunk/README 2009-07-23 09:36:47 UTC (rev 284639) @@ -1,9 +1,6 @@ Very very fast guide - -1) ./scripts/co_php5.sh -(this will checkout an anonymous fresh copy of PHP5 source code at ./src/php5 dir.) +1) ./build_src.sh src/php-src-trunk +(copy cmake files to PHP trunk source code and launch cmake.)) -2) ./build_src.sh src/php5 -(copy cmake files to PHP5 source code and launch cmake.)) - Deleted: php/cmake/trunk/scripts/co_php5.sh === --- php/cmake/trunk/scripts/co_php5.sh 2009-07-23 08:38:12 UTC (rev 284638) +++ php/cmake/trunk/scripts/co_php5.sh 2009-07-23 09:36:47 UTC (rev 284639) @@ -1,11 +0,0 @@ -#!/bin/sh -x -# -# $Id$ - -SRC_DIR=`dirname $0`/../src - -# HEAD -cd $SRC_DIR && cvs -d :pserver:cvsr...@cvs.php.net:/repository checkout php5 - -# branch 5.3 -#cd $SRC_DIR && cvs -d :pserver:cvsr...@cvs.php.net:/repository checkout -r PHP_5_3 php5 Deleted: php/cmake/trunk/scripts/co_php6.sh === --- php/cmake/trunk/scripts/co_php6.sh 2009-07-23 08:38:12 UTC (rev 284638) +++ php/cmake/trunk/scripts/co_php6.sh 2009-07-23 09:36:47 UTC (rev 284639) @@ -1,7 +0,0 @@ -#!/bin/sh -x -# -# $Id$ - -SRC_DIR=`dirname $0`/../src - -cd $SRC_DIR && cvs -d :pserver:cvsr...@cvs.php.net:/repository checkout php6 Property changes on: php/cmake/trunk/src ___ Added: svn:externals + php-src-trunk http://svn.php.net/repository/php/php-src/trunk -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/phpruntests/trunk/ build.xml
spriebschThu, 23 Jul 2009 08:38:12 + Revision: http://svn.php.net/viewvc?view=revision&revision=284638 Log: Modified build automation run phpt's in /tmp directory. Added new/new comparison with baseline linux results. Changed paths: U php/phpruntests/trunk/build.xml Modified: php/phpruntests/trunk/build.xml === --- php/phpruntests/trunk/build.xml 2009-07-23 07:38:29 UTC (rev 284637) +++ php/phpruntests/trunk/build.xml 2009-07-23 08:38:12 UTC (rev 284638) @@ -53,15 +53,19 @@ - - - - + + - - - - + + + + + + + + + + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
