[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/tests/security/ open_basedir.inc open_basedir_copy.phpt
jani Sat, 25 Jul 2009 00:43:42 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284733
Log:
- Fix tests .oO(why are there so many things broken in this branch..?)
Changed paths:
U php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc
U php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt
Modified: php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc
===
--- php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc
2009-07-25 00:35:25 UTC (rev 284732)
+++ php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc
2009-07-25 00:43:42 UTC (rev 284733)
@@ -90,7 +90,6 @@
global $savedDirectory;
echo "*** Testing open_basedir configuration [$function] ***\n";
$directory = getcwd();
-var_dump($directory);
$savedDirectory = $directory;
var_dump(chdir($directory));
create_directories();
Modified: php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt
===
--- php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt
2009-07-25 00:35:25 UTC (rev 284732)
+++ php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt
2009-07-25 00:43:42 UTC (rev 284733)
@@ -1,11 +1,78 @@
--TEST--
Test open_basedir configuration
--INI--
-open_basedir={PWD}
+open_basedir=.
--FILE--
+--CLEAN--
+
+--EXPECTF--
+*** Testing open_basedir configuration [copy] ***
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+
+Warning: copy(): open_basedir restriction in effect. File(../bad) is not
within the allowed path(s): (.) in %s on line %d
+
+Warning: copy(../bad): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(../bad/bad.txt) is
not within the allowed path(s): (.) in %s on line %d
+
+Warning: copy(../bad/bad.txt): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(..) is not within
the allowed path(s): (.) in %s on line %d
+
+Warning: copy(..): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(../) is not within
the allowed path(s): (.) in %s on line %d
+
+Warning: copy(../): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(/) is not within the
allowed path(s): (.) in %s on line %d
+
+Warning: copy(/): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(../bad/.) is not
within the allowed path(s): (.) in %s on line %d
+
+Warning: copy(../bad/.): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(../bad/./bad.txt) is
not within the allowed path(s): (.) in %s on line %d
+
+Warning: copy(../bad/./bad.txt): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(./../.) is not
within the allowed path(s): (.) in %s on line %d
+
+Warning: copy(./../.): failed to open stream: %s in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+*** Finished testing open_basedir configuration [copy] ***
+
--
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/sapi/cgi/tests/006.phpt branches/PHP_5_3/sapi/cgi/tests/006.phpt trunk/sapi/cgi/tests/006.phpt
jani Sat, 25 Jul 2009 00:35:25 + Revision: http://svn.php.net/viewvc?view=revision&revision=284732 Log: - Fix test Changed paths: U php/php-src/branches/PHP_5_2/sapi/cgi/tests/006.phpt U php/php-src/branches/PHP_5_3/sapi/cgi/tests/006.phpt U php/php-src/trunk/sapi/cgi/tests/006.phpt Modified: php/php-src/branches/PHP_5_2/sapi/cgi/tests/006.phpt === --- php/php-src/branches/PHP_5_2/sapi/cgi/tests/006.phpt2009-07-25 00:10:47 UTC (rev 284731) +++ php/php-src/branches/PHP_5_2/sapi/cgi/tests/006.phpt2009-07-25 00:35:25 UTC (rev 284732) @@ -42,7 +42,7 @@ file_put_contents($filename, $code); -var_dump(`"$php" -n -l "$filename" 2>/dev/null`); +var_dump(`"$php" -n -l "$filename"`); @unlink($filename); Modified: php/php-src/branches/PHP_5_3/sapi/cgi/tests/006.phpt === --- php/php-src/branches/PHP_5_3/sapi/cgi/tests/006.phpt2009-07-25 00:10:47 UTC (rev 284731) +++ php/php-src/branches/PHP_5_3/sapi/cgi/tests/006.phpt2009-07-25 00:35:25 UTC (rev 284732) @@ -42,7 +42,7 @@ file_put_contents($filename, $code); -var_dump(`"$php" -l "$filename" 2>/dev/null`); +var_dump(`"$php" -n -l "$filename"`); @unlink($filename); Modified: php/php-src/trunk/sapi/cgi/tests/006.phpt === --- php/php-src/trunk/sapi/cgi/tests/006.phpt 2009-07-25 00:10:47 UTC (rev 284731) +++ php/php-src/trunk/sapi/cgi/tests/006.phpt 2009-07-25 00:35:25 UTC (rev 284732) @@ -42,7 +42,7 @@ file_put_contents($filename, $code); -var_dump(`"$php" -n -l "$filename" 2>/dev/null`); +var_dump(`"$php" -n -l "$filename"`); @unlink($filename); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/intl/ config.m4
jani Sat, 25 Jul 2009 00:10:47 + Revision: http://svn.php.net/viewvc?view=revision&revision=284731 Log: - Fix build Changed paths: U php/php-src/trunk/ext/intl/config.m4 Modified: php/php-src/trunk/ext/intl/config.m4 === --- php/php-src/trunk/ext/intl/config.m42009-07-24 23:55:49 UTC (rev 284730) +++ php/php-src/trunk/ext/intl/config.m42009-07-25 00:10:47 UTC (rev 284731) @@ -55,4 +55,5 @@ PHP_ADD_BUILD_DIR([$ext_builddir/locale]) PHP_ADD_BUILD_DIR([$ext_builddir/msgformat]) PHP_ADD_BUILD_DIR([$ext_builddir/grapheme]) + PHP_ADD_BUILD_DIR([$ext_builddir/idn]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / pecl/phar/trunk/tests/016.phpt php/php-src/branches/PHP_5_3/ext/phar/tests/016.phpt
cellog Fri, 24 Jul 2009 23:55:49 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284730
Log:
merge from HEAD changes to test
Changed paths:
U pecl/phar/trunk/tests/016.phpt
U php/php-src/branches/PHP_5_3/ext/phar/tests/016.phpt
Modified: pecl/phar/trunk/tests/016.phpt
===
--- pecl/phar/trunk/tests/016.phpt 2009-07-24 23:53:24 UTC (rev 284729)
+++ pecl/phar/trunk/tests/016.phpt 2009-07-24 23:55:49 UTC (rev 284730)
@@ -9,14 +9,14 @@
";
+$file = b"";
// file length is too short
$files = array();
// "hi" gzdeflated
-$files['a'] = array('cont'=>'a','comp'=> pack('H*',
'cbc80400'),'flags'=>0x1000, 'ulen' => 1, 'clen' => 4);
+$files['a'] = array('cont'=>b'a','comp'=> (binary)pack('H*',
'cbc80400'),'flags'=>0x1000, 'ulen' => 1, 'clen' => 4);
$files['b'] = $files['a'];
-$files['c'] = array('cont'=>'*');
+$files['c'] = array('cont'=>b'*');
$files['d'] = $files['a'];
include 'files/phar_test.inc';
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/016.phpt
===
--- php/php-src/branches/PHP_5_3/ext/phar/tests/016.phpt2009-07-24
23:53:24 UTC (rev 284729)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/016.phpt2009-07-24
23:55:49 UTC (rev 284730)
@@ -9,14 +9,14 @@
";
+$file = b"";
// file length is too short
$files = array();
// "hi" gzdeflated
-$files['a'] = array('cont'=>'a','comp'=> pack('H*',
'cbc80400'),'flags'=>0x1000, 'ulen' => 1, 'clen' => 4);
+$files['a'] = array('cont'=>b'a','comp'=> (binary)pack('H*',
'cbc80400'),'flags'=>0x1000, 'ulen' => 1, 'clen' => 4);
$files['b'] = $files['a'];
-$files['c'] = array('cont'=>'*');
+$files['c'] = array('cont'=>b'*');
$files['d'] = $files['a'];
include 'files/phar_test.inc';
--
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/mbstring/ mb_gpc.c
moriyoshiFri, 24 Jul 2009 23:50:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284728
Log:
- MFH
Changed paths:
U php/php-src/branches/PHP_5_2/ext/mbstring/mb_gpc.c
Modified: php/php-src/branches/PHP_5_2/ext/mbstring/mb_gpc.c
===
--- php/php-src/branches/PHP_5_2/ext/mbstring/mb_gpc.c 2009-07-24 23:48:58 UTC
(rev 284727)
+++ php/php-src/branches/PHP_5_2/ext/mbstring/mb_gpc.c 2009-07-24 23:50:12 UTC
(rev 284728)
@@ -59,7 +59,7 @@
enum mbfl_no_encoding detected;
php_mb_encoding_handler_info_t info;
- {
+ if (arg != PARSE_STRING) {
char *value = zend_ini_string("mbstring.internal_encoding",
sizeof("mbstring.internal_encoding"), 0);
_php_mb_ini_mbstring_internal_encoding_set(value, value ?
strlen(value): 0 TSRMLS_CC);
}
--
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/mbstring/ mb_gpc.c
moriyoshiFri, 24 Jul 2009 23:48:58 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284727
Log:
- MFH (using svn merge; it seems I won't need to repeat the commit message
anymore)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mbstring/mb_gpc.c
Modified: php/php-src/branches/PHP_5_3/ext/mbstring/mb_gpc.c
===
--- php/php-src/branches/PHP_5_3/ext/mbstring/mb_gpc.c 2009-07-24 23:44:43 UTC
(rev 284726)
+++ php/php-src/branches/PHP_5_3/ext/mbstring/mb_gpc.c 2009-07-24 23:48:58 UTC
(rev 284727)
@@ -59,7 +59,7 @@
enum mbfl_no_encoding detected;
php_mb_encoding_handler_info_t info;
- {
+ if (arg != PARSE_STRING) {
char *value = zend_ini_string("mbstring.internal_encoding",
sizeof("mbstring.internal_encoding"), 0);
_php_mb_ini_mbstring_internal_encoding_set(value, value ?
strlen(value): 0 TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/mbstring/ mb_gpc.c
moriyoshiFri, 24 Jul 2009 23:44:43 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284726
Log:
- Probably harmless, but it should have been done this way.
Changed paths:
U php/php-src/trunk/ext/mbstring/mb_gpc.c
Modified: php/php-src/trunk/ext/mbstring/mb_gpc.c
===
--- php/php-src/trunk/ext/mbstring/mb_gpc.c 2009-07-24 23:01:22 UTC (rev
284725)
+++ php/php-src/trunk/ext/mbstring/mb_gpc.c 2009-07-24 23:44:43 UTC (rev
284726)
@@ -59,7 +59,7 @@
enum mbfl_no_encoding detected;
php_mb_encoding_handler_info_t info;
- {
+ if (arg != PARSE_STRING) {
char *value = zend_ini_string("mbstring.internal_encoding",
sizeof("mbstring.internal_encoding"), 0);
_php_mb_ini_mbstring_internal_encoding_set(value, value ?
strlen(value): 0 TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / pecl/phar/trunk/tests/009.phpt php/php-src/branches/PHP_5_3/ext/phar/tests/009.phpt php/php-src/trunk/ext/phar/tests/009.phpt php/php-src/trunk/ext/phar/tests/016.phpt
cellog Fri, 24 Jul 2009 22:09:36 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284724
Log:
update test to work in php 6
Changed paths:
U pecl/phar/trunk/tests/009.phpt
U php/php-src/branches/PHP_5_3/ext/phar/tests/009.phpt
U php/php-src/trunk/ext/phar/tests/009.phpt
U php/php-src/trunk/ext/phar/tests/016.phpt
Modified: pecl/phar/trunk/tests/009.phpt
===
--- pecl/phar/trunk/tests/009.phpt 2009-07-24 21:32:22 UTC (rev 284723)
+++ pecl/phar/trunk/tests/009.phpt 2009-07-24 22:09:36 UTC (rev 284724)
@@ -9,7 +9,7 @@
$file = b"";
-$file .= pack('VVnVVV', 500, 500, 0x1000, 0x, 0, 0) . str_repeat('A',
500);
+$file .= (binary) pack(b'VVnVVV', 500, 500, 0x1000, 0x, 0, 0) .
(binary) str_repeat((binary)'A', 500);
file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') .
'.phar.php', $file);
try {
include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/009.phpt
===
--- php/php-src/branches/PHP_5_3/ext/phar/tests/009.phpt2009-07-24
21:32:22 UTC (rev 284723)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/009.phpt2009-07-24
22:09:36 UTC (rev 284724)
@@ -9,7 +9,7 @@
$file = b"";
-$file .= pack('VVnVVV', 500, 500, 0x1000, 0x, 0, 0) . str_repeat('A',
500);
+$file .= (binary) pack(b'VVnVVV', 500, 500, 0x1000, 0x, 0, 0) .
(binary) str_repeat((binary)'A', 500);
file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') .
'.phar.php', $file);
try {
include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
Modified: php/php-src/trunk/ext/phar/tests/009.phpt
===
--- php/php-src/trunk/ext/phar/tests/009.phpt 2009-07-24 21:32:22 UTC (rev
284723)
+++ php/php-src/trunk/ext/phar/tests/009.phpt 2009-07-24 22:09:36 UTC (rev
284724)
@@ -9,7 +9,7 @@
$file = b"";
-$file .= pack('VVnVVV', 500, 500, 0x1000, 0x, 0, 0) . str_repeat('A',
500);
+$file .= (binary) pack(b'VVnVVV', 500, 500, 0x1000, 0x, 0, 0) .
(binary) str_repeat((binary)'A', 500);
file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') .
'.phar.php', $file);
try {
include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
Modified: php/php-src/trunk/ext/phar/tests/016.phpt
===
--- php/php-src/trunk/ext/phar/tests/016.phpt 2009-07-24 21:32:22 UTC (rev
284723)
+++ php/php-src/trunk/ext/phar/tests/016.phpt 2009-07-24 22:09:36 UTC (rev
284724)
@@ -9,14 +9,14 @@
";
+$file = b"";
// file length is too short
$files = array();
// "hi" gzdeflated
-$files['a'] = array('cont'=>'a','comp'=> pack('H*',
'cbc80400'),'flags'=>0x1000, 'ulen' => 1, 'clen' => 4);
+$files['a'] = array('cont'=>b'a','comp'=> (binary)pack('H*',
'cbc80400'),'flags'=>0x1000, 'ulen' => 1, 'clen' => 4);
$files['b'] = $files['a'];
-$files['c'] = array('cont'=>'*');
+$files['c'] = array('cont'=>b'*');
$files['d'] = $files['a'];
include 'files/phar_test.inc';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/phar/ config.m4
cellog Fri, 24 Jul 2009 21:32:22 + Revision: http://svn.php.net/viewvc?view=revision&revision=284723 Log: merge unmerged changes from php 5.3 Changed paths: U php/php-src/trunk/ext/phar/config.m4 Modified: php/php-src/trunk/ext/phar/config.m4 === --- php/php-src/trunk/ext/phar/config.m42009-07-24 21:27:51 UTC (rev 284722) +++ php/php-src/trunk/ext/phar/config.m42009-07-24 21:32:22 UTC (rev 284723) @@ -8,7 +8,9 @@ PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) AC_MSG_CHECKING([for phar openssl support]) if test "$PHP_HASH_SHARED" != "yes"; then -AC_DEFINE(PHAR_HASH_OK,1,[ ]) +if test "$PHP_HASH" != "no"; then + AC_DEFINE(PHAR_HASH_OK,1,[ ]) +fi else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi @@ -22,6 +24,7 @@ AC_MSG_RESULT([no]) fi fi + PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / pecl/phar/trunk/phar_object.c php/php-src/branches/PHP_5_3/ext/phar/phar_object.c php/php-src/trunk/ext/phar/phar_object.c
cellog Fri, 24 Jul 2009 21:27:51 + Revision: http://svn.php.net/viewvc?view=revision&revision=284722 Log: fix PHAR_ARG_INFO #define to work with PHP major versions > 5 Changed paths: U pecl/phar/trunk/phar_object.c U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c U php/php-src/trunk/ext/phar/phar_object.c Modified: pecl/phar/trunk/phar_object.c === --- pecl/phar/trunk/phar_object.c 2009-07-24 21:10:51 UTC (rev 284721) +++ pecl/phar/trunk/phar_object.c 2009-07-24 21:27:51 UTC (rev 284722) @@ -30,7 +30,7 @@ static zend_class_entry *phar_ce_entry; #endif -#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3) +#if PHP_MAJOR_VERSION > 5 || ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)) # define PHAR_ARG_INFO #else # define PHAR_ARG_INFO static Modified: php/php-src/branches/PHP_5_3/ext/phar/phar_object.c === --- php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-07-24 21:10:51 UTC (rev 284721) +++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-07-24 21:27:51 UTC (rev 284722) @@ -30,7 +30,7 @@ static zend_class_entry *phar_ce_entry; #endif -#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3) +#if PHP_MAJOR_VERSION > 5 || ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)) # define PHAR_ARG_INFO #else # define PHAR_ARG_INFO static Modified: php/php-src/trunk/ext/phar/phar_object.c === --- php/php-src/trunk/ext/phar/phar_object.c2009-07-24 21:10:51 UTC (rev 284721) +++ php/php-src/trunk/ext/phar/phar_object.c2009-07-24 21:27:51 UTC (rev 284722) @@ -30,7 +30,7 @@ static zend_class_entry *phar_ce_entry; #endif -#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3) +#if PHP_MAJOR_VERSION > 5 || ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)) # define PHAR_ARG_INFO #else # define PHAR_ARG_INFO static -- 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/Makefile.global trunk/Makefile.global
jani Fri, 24 Jul 2009 20:24:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284719
Log:
- Fixed bug #48835 (Deprecated php.ini options in old php.inis makes "make
test" to fail)
Bug: http://bugs.php.net/48835 (Assigned) Deprecated php.ini options in old
php.ini's makes "make test" to fail
Changed paths:
U php/php-src/branches/PHP_5_3/Makefile.global
U php/php-src/trunk/Makefile.global
Modified: php/php-src/branches/PHP_5_3/Makefile.global
===
--- php/php-src/branches/PHP_5_3/Makefile.global2009-07-24 19:51:55 UTC
(rev 284718)
+++ php/php-src/branches/PHP_5_3/Makefile.global2009-07-24 20:24:12 UTC
(rev 284719)
@@ -89,14 +89,14 @@
elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -d
'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
if test "$$INI_FILE"; then \
- $(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*='
"$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
+ $(EGREP) -v
'^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
else \
echo > $(top_builddir)/tmp-php.ini; \
fi; \
INI_SCANNED_PATH=`$(top_builddir)/$(SAPI_CLI_PATH) -d
'display_errors=stderr' -r '$$a = explode(",\n",
trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
if test "$$INI_SCANNED_PATH"; then \
INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d
$$INI_SCANNED_PATH`; \
- $(EGREP) -h -v '^(zend_)?extension(_debug)?(_ts)?[\t\
]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+ $(EGREP) -h -v
'^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
@@ -115,7 +115,7 @@
rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET)
modules/* libs/*
distclean: clean
- rm -f Makefile config.cache config.log config.status Makefile.objects
Makefile.fragments libtool main/php_config.h stamp-h php5.spec
sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+ rm -f Makefile config.cache config.log config.status Makefile.objects
Makefile.fragments libtool main/php_config.h stamp-h
sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED)
's/.*>//'|xargs rm -f
.PHONY: all clean install distclean test
Modified: php/php-src/trunk/Makefile.global
===
--- php/php-src/trunk/Makefile.global 2009-07-24 19:51:55 UTC (rev 284718)
+++ php/php-src/trunk/Makefile.global 2009-07-24 20:24:12 UTC (rev 284719)
@@ -89,14 +89,14 @@
elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -d
'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
if test "$$INI_FILE"; then \
- $(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*='
"$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
+ $(EGREP) -v
'^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
else \
echo > $(top_builddir)/tmp-php.ini; \
fi; \
INI_SCANNED_PATH=`$(top_builddir)/$(SAPI_CLI_PATH) -d
'display_errors=stderr' -r '$$a = explode(",\n",
trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
if test "$$INI_SCANNED_PATH"; then \
INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d
$$INI_SCANNED_PATH`; \
- $(EGREP) -h -v '^(zend_)?extension(_debug)?(_ts)?[\t\
]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+ $(EGREP) -h -v
'^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
--
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/parse_str_basic3.phpt PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt
jani Fri, 24 Jul 2009 19:51:55 + Revision: http://svn.php.net/viewvc?view=revision&revision=284718 Log: - Fix test Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/parse_str_basic3.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/parse_str_basic3.phpt === --- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/parse_str_basic3.phpt 2009-07-24 19:44:07 UTC (rev 284717) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/parse_str_basic3.phpt 2009-07-24 19:51:55 UTC (rev 284718) @@ -1,5 +1,5 @@ --TEST-- -Test parse_str() function : ?? +Test parse_str() function : basic functionality --INI-- magic_quotes_gpc = on --FILE-- @@ -265,4 +265,4 @@ } } } -===DONE=== \ No newline at end of file +===DONE=== Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt 2009-07-24 19:44:07 UTC (rev 284717) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt 2009-07-24 19:51:55 UTC (rev 284718) @@ -1,11 +1,14 @@ --TEST-- Test parse_str() function : basic functionality +--INI-- +magic_quotes_gpc = on --FILE-- ===DONE=== --EXPECTF-- +PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 *** Testing parse_str() : basic functionality *** Test string with array values @@ -263,4 +267,4 @@ } } } -===DONE=== \ No newline at end of file +===DONE=== -- 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/mbstring/tests/
jani Fri, 24 Jul 2009 19:44:07 + Revision: http://svn.php.net/viewvc?view=revision&revision=284717 Log: - Missing svn:ignore Changed paths: _U php/php-src/branches/PHP_5_3/ext/mbstring/tests/ Property changes on: php/php-src/branches/PHP_5_3/ext/mbstring/tests ___ 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/tests/phar_convert_again.phpt pecl/phar/trunk/tests/zip/all.phpt pecl/phar/trunk/zip.c php/php-src/branches/PHP_5_3/ext/phar/tests/phar_convert_again.phpt php/php-src/
cellog Fri, 24 Jul 2009 19:40:41 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284716
Log:
fix --CLEAN-- of all.phpt, remove unnecessary check in phar_convert_again.phpt,
and fix signature generation and checking for zip to also include central
directory up to the signature, implement better check for end-of-zip at
signature verification
Changed paths:
U pecl/phar/trunk/tests/phar_convert_again.phpt
U pecl/phar/trunk/tests/zip/all.phpt
U pecl/phar/trunk/zip.c
U php/php-src/branches/PHP_5_3/ext/phar/tests/phar_convert_again.phpt
U php/php-src/branches/PHP_5_3/ext/phar/tests/zip/all.phpt
U php/php-src/branches/PHP_5_3/ext/phar/zip.c
U php/php-src/trunk/ext/phar/tests/phar_convert_again.phpt
U php/php-src/trunk/ext/phar/tests/zip/all.phpt
U php/php-src/trunk/ext/phar/zip.c
Modified: pecl/phar/trunk/tests/phar_convert_again.phpt
===
--- pecl/phar/trunk/tests/phar_convert_again.phpt 2009-07-24 19:21:10 UTC (rev 284715)
+++ pecl/phar/trunk/tests/phar_convert_again.phpt 2009-07-24 19:40:41 UTC (rev 284716)
@@ -62,11 +62,6 @@
} catch (Exception $e) {
echo $e->getMessage() . "\n";
}
-try {
-$data->setSignatureAlgorithm(Phar::MD5);
-} catch (Exception $e) {
-echo $e->getMessage() . "\n";
-}
$tar = $phar->convertToExecutable(Phar::TAR);
echo $tar->getPath() . "\n";
$data = $tar->convertToData();
@@ -188,7 +183,6 @@
A Phar stub cannot be set in a plain zip archive
A Phar stub cannot be set in a plain zip archive
A Phar alias cannot be set in a plain zip archive
-Cannot set signature algorithm, not possible with zip-based phar archives
%sphar_convert_again2.phar.tar
%sphar_convert_again2.tar
%sphar_convert_again2.phar.tar.gz
Modified: pecl/phar/trunk/tests/zip/all.phpt
===
--- pecl/phar/trunk/tests/zip/all.phpt 2009-07-24 19:21:10 UTC (rev 284715)
+++ pecl/phar/trunk/tests/zip/all.phpt 2009-07-24 19:40:41 UTC (rev 284716)
@@ -46,6 +46,7 @@
?>
===DONE===
--CLEAN--
+
--EXPECT--
bool(false)
Modified: pecl/phar/trunk/zip.c
===
--- pecl/phar/trunk/zip.c 2009-07-24 19:21:10 UTC (rev 284715)
+++ pecl/phar/trunk/zip.c 2009-07-24 19:40:41 UTC (rev 284716)
@@ -350,6 +350,7 @@
/* add each central directory item to the manifest */
for (i = 0; i < PHAR_GET_16(locator.count); ++i) {
phar_zip_central_dir_file zipentry;
+ off_t beforeus = php_stream_tell(fp);
if (sizeof(zipentry) != php_stream_read(fp, (char *) &zipentry, sizeof(zipentry))) {
PHAR_ZIP_FAIL("unable to read central directory entry, truncated");
@@ -404,24 +405,34 @@
if (entry.filename_len == sizeof(".phar/signature.bin")-1 && !strncmp(entry.filename, ".phar/signature.bin", sizeof(".phar/signature.bin")-1)) {
size_t read;
php_stream *sigfile;
+ off_t now;
+ char *sig;
+ now = php_stream_tell(fp);
pefree(entry.filename, entry.is_persistent);
sigfile = php_stream_fopen_tmpfile();
php_stream_seek(fp, 0, SEEK_SET);
/* copy file contents + local headers and zip comment, if any, to be hashed for signature */
phar_stream_copy_to_stream(fp, sigfile, entry.header_offset, NULL);
+ /* seek to central directory */
+ php_stream_seek(fp, PHAR_GET_32(locator.cdir_offset), SEEK_SET);
+ /* copy central directory header */
+ phar_stream_copy_to_stream(fp, sigfile, beforeus - PHAR_GET_32(locator.cdir_offset), NULL);
if (metadata) {
php_stream_write(sigfile, metadata, PHAR_GET_16(locator.comment_len));
}
php_stream_seek(fp, sizeof(phar_zip_file_header) + entry.header_offset + entry.filename_len + PHAR_GET_16(zipentry.extra_len), SEEK_SET);
- read = php_stream_read(fp, buf, entry.uncompressed_filesize);
+ sig = (char *) emalloc(entry.uncompressed_filesize);
+ read = php_stream_read(fp, sig, entry.uncompressed_filesize);
if (read != entry.uncompressed_filesize) {
php_stream_close(sigfile);
+efree(sig);
PHAR_ZIP_FAIL("signature cannot be read");
}
- mydata->sig_flags = PHAR_GET_32(buf);
- if (FAILURE == phar_verify_signature(sigfile, php_stream_tell(sigfile), mydata->sig_flags, buf + 8, entry.uncompressed_filesize - 8, fname, &mydata->signature, &mydata->sig_len, error TSRMLS_CC)) {
+ mydata->sig_flags = PHAR_GET_32(sig);
+ if (FAILURE == phar_verify_signature(sigfile, php_stream_tell(sigfile), mydata->sig_flags, sig + 8, entry.uncompressed_filesize - 8, fname, &mydata->signature, &mydata->sig_len, error TSRMLS_CC)) {
+efree(sig);
if (error) {
char *save;
php_stream_close(sigfile);
@@ -434,14 +445,9 @@
}
}
php_stream_close(sigfile);
+ efree(sig);
/* signature checked out, let's ensure this is the last file in the phar */
- read = php_stream_read(fp, buf, 4);
-
- if (read != 4) {
-PHAR_ZIP_FAIL("corrupted zip fil
[PHP-CVS] svn: /SVNROOT/ commit-bugs.php commit-email.php commit-svnroot.php hook-common.inc.php post-commit pre-commit start-commit
gwynne Fri, 24 Jul 2009 18:54:54 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284714
Log:
- Restructure hooks again. They now use a common include which does a bunch of
common stuff.
- Use PHP_EOL instead of a literal \n for commit emails. Paranoia.
- Now provide more information on copied paths (esp. for tagging)
- Creating tags by copying an existing directory is now allowed
- start-commit doesn't need to do anything
- reduce the number of times the path list is iterated in pre-commit
- Now mix and match the use of global and pear avail files on a per-path basis
- TODO: Parse the avail files only once instead of once per committed path
- Replace regexp with simple string ops for just about everything
- Don't bother storing the URL prefix as part of the bug info, nothing used that
- Remove worthless $Revision$ constants. Another thing nothing used.
Changed paths:
U SVNROOT/commit-bugs.php
U SVNROOT/commit-email.php
U SVNROOT/commit-svnroot.php
A SVNROOT/hook-common.inc.php
U SVNROOT/post-commit
U SVNROOT/pre-commit
U SVNROOT/start-commit
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-24 18:08:42 UTC (rev 284713)
+++ SVNROOT/commit-bugs.php 2009-07-24 18:54:54 UTC (rev 284714)
@@ -5,7 +5,6 @@
// -
// Constants
-$version = substr('$Revision$', strlen('$Revision: '), -2);
$bug_pattern = '/(?:(pecl|pear|php)\s*)?(?:bug|#)[\s#:]*([0-9]+)/iuX';
$bug_url_prefixes = array(
'pear' => 'http://pear.php.net/bugs',
@@ -45,8 +44,8 @@
$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[''];
-$bug['url'] = $bug['url_prefix'] . '/' . $bug['number'];
+$url_prefix = isset($bug_url_prefixes[$bug['project']]) ? $bug_url_prefixes[$bug['project']] : $bug_url_prefixes[''];
+$bug['url'] = $url_prefix . '/' . $bug['number'];
$bug['status'] = 'unknown';
$bug['short_desc'] = '';
$bug_list[$bugid] = $bug;
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php 2009-07-24 18:08:42 UTC (rev 284713)
+++ SVNROOT/commit-email.php 2009-07-24 18:54:54 UTC (rev 284714)
@@ -5,7 +5,6 @@
// -
// Constants
-$version = substr('$Revision$', strlen('$Revision: '), -2);
$smtp_server = '127.0.0.1';
$commit_email_list = array(
@@ -103,19 +102,6 @@
$always_addresses = array('gwy...@php.net');
// -
-function common_prefix($str1, $str2)
-{
-$result = "";
-$i = 0;
-$max = min(strlen($str1), strlen($str2));
-while ($i < $max && $str1[$i] === $str2[$i]) {
-$result .= $str1[$i];
-++$i;
-}
-return $result;
-}
-
-// -
// Build list of e-mail addresses and parent changed path
$emails_to = array();
$parent_path = '/' . $commit_info['dirs_changed'][0];
@@ -150,22 +136,21 @@
// Process bugs
$bugs_body = '';
if (isset($bug_list) && count($bug_list) > 0) {
-$bugs_body = count($bug_list) > 1 ? "\nBugs: " : "\nBug: ";
+$bugs_body = PHP_EOL . (count($bug_list) > 1 ? "Bugs: " : "Bug: ");
foreach ($bug_list as $n => $bug) {
if (isset($bug['error'])) {
$status = '(error getting bug information)';
} else {
$status = "({$bug['status']}) {$bug['short_desc']}";
}
-$bugs_body .= "{$bug['url']} {$status}\n ";
+$bugs_body .= "{$bug['url']} {$status}" . PHP_EOL . " ";
}
}
// -
// Process changed paths
$paths_list = $parent_path;
-foreach ($commit_info['changed_paths'] as $changed_path) {
-$changed_path = trim(strstr($changed_path, ' '));
+foreach ($commit_info['changed_paths'] as $changed_path => $path_actions) {
if (substr($changed_path, -1) !== '/') {
$paths_list .= ' ' . substr($changed_path, strlen($parent_path) - 1);
}
@@ -179,13 +164,13 @@
$email_date = date(DATE_RFC2822, $commit_info['date']);
$fullname = "=?utf-8?q?" . imap_8bit(str_replace(array('?', ' '), array('=3F', '_'), $commit_info['author_name'])) . "?=";
$email_l
[PHP-CVS] svn: / pecl/phar/trunk/Makefile.frag pecl/phar/trunk/dirstream.c pecl/phar/trunk/dirstream.h pecl/phar/trunk/func_interceptors.c pecl/phar/trunk/func_interceptors.h pecl/phar/trunk/phar.c pe
cellog Fri, 24 Jul 2009 17:07:05 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284712
Log:
merge unmerged changes between branches, remove unnecessary test for zip
signature failure in badparameters.phpt
Changed paths:
U pecl/phar/trunk/Makefile.frag
U pecl/phar/trunk/dirstream.c
U pecl/phar/trunk/dirstream.h
U pecl/phar/trunk/func_interceptors.c
U pecl/phar/trunk/func_interceptors.h
U pecl/phar/trunk/phar.c
U pecl/phar/trunk/phar_internal.h
U pecl/phar/trunk/phar_object.c
U pecl/phar/trunk/phar_path_check.c
U pecl/phar/trunk/phar_path_check.re
U pecl/phar/trunk/pharzip.h
U pecl/phar/trunk/php_phar.h
U pecl/phar/trunk/stream.c
U pecl/phar/trunk/stream.h
U pecl/phar/trunk/stub.h
U pecl/phar/trunk/tar.c
U pecl/phar/trunk/tar.h
U pecl/phar/trunk/tests/badparameters.phpt
U pecl/phar/trunk/util.c
U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
U php/php-src/branches/PHP_5_3/ext/phar/tests/badparameters.phpt
U php/php-src/trunk/ext/phar/func_interceptors.c
U php/php-src/trunk/ext/phar/phar.c
U php/php-src/trunk/ext/phar/phar_object.c
U php/php-src/trunk/ext/phar/tar.c
U php/php-src/trunk/ext/phar/tests/badparameters.phpt
U php/php-src/trunk/ext/phar/util.c
Modified: pecl/phar/trunk/Makefile.frag
===
--- pecl/phar/trunk/Makefile.frag 2009-07-24 16:50:06 UTC (rev 284711)
+++ pecl/phar/trunk/Makefile.frag 2009-07-24 17:07:05 UTC (rev 284712)
@@ -4,7 +4,7 @@
pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
-PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
+PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0'
PHP_PHARCMD_EXECUTABLE = ` \
if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
$(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
Modified: pecl/phar/trunk/dirstream.c
===
--- pecl/phar/trunk/dirstream.c 2009-07-24 16:50:06 UTC (rev 284711)
+++ pecl/phar/trunk/dirstream.c 2009-07-24 17:07:05 UTC (rev 284712)
@@ -2,7 +2,7 @@
+--+
| phar:// stream wrapper support |
+--+
- | Copyright (c) 2005-2008 The PHP Group|
+ | Copyright (c) 2005-2009 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
Modified: pecl/phar/trunk/dirstream.h
===
--- pecl/phar/trunk/dirstream.h 2009-07-24 16:50:06 UTC (rev 284711)
+++ pecl/phar/trunk/dirstream.h 2009-07-24 17:07:05 UTC (rev 284712)
@@ -2,7 +2,7 @@
+--+
| phar php single-file executable PHP extension|
+--+
- | Copyright (c) 2006-2008 The PHP Group|
+ | Copyright (c) 2006-2009 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
Modified: pecl/phar/trunk/func_interceptors.c
===
--- pecl/phar/trunk/func_interceptors.c 2009-07-24 16:50:06 UTC (rev 284711)
+++ pecl/phar/trunk/func_interceptors.c 2009-07-24 17:07:05 UTC (rev 284712)
@@ -2,7 +2,7 @@
+--+
| phar php single-file executable PHP extension|
+--+
- | Copyright (c) 2005-2008 The PHP Group|
+ | Copyright (c) 2005-2009 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
@@ -646,8 +646,8 @@
/* fopen within phar, if :// is not in the url, then prepend phar:/// */
entry_len = (int) filename_length;
if (FAILURE == phar_get_archive(&phar, arch, arch_len, NULL, 0, NULL TSRMLS_CC)) {
+efree(arch);
efree(e
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/win32/build/ confutils.js
derick Fri, 24 Jul 2009 16:30:48 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284709
Log:
- Added - to the list of "unsafe" characters so that the pecl dir can have the
- character in the name.
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2009-07-24
16:21:40 UTC (rev 284708)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2009-07-24
16:30:48 UTC (rev 284709)
@@ -1286,12 +1286,12 @@
* as either a child or a sibling */
if (obj_dir == null) {
var build_dir = dir.replace(new RegExp("^.."), "");
- var mangle_dir = build_dir.replace(new RegExp("[/.]", "g"),
"_");
+ var mangle_dir = build_dir.replace(new RegExp("[/.-]",
"g"), "_");
var bd_flags_name = "CFLAGS_BD_" + mangle_dir.toUpperCase();
}
else {
var build_dir = obj_dir.replace(new RegExp("^.."), "");
- var mangle_dir = build_dir.replace(new RegExp("[/.]", "g"),
"_");
+ var mangle_dir = build_dir.replace(new RegExp("[/.-]",
"g"), "_");
var bd_flags_name = "CFLAGS_BD_" + mangle_dir.toUpperCase();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / pecl/phar/trunk/zip.c php/php-src/branches/PHP_5_3/ext/phar/zip.c php/php-src/trunk/ext/phar/zip.c
cellog Fri, 24 Jul 2009 16:21:40 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284708
Log:
fix minor memory leak
Changed paths:
U pecl/phar/trunk/zip.c
U php/php-src/branches/PHP_5_3/ext/phar/zip.c
U php/php-src/trunk/ext/phar/zip.c
Modified: pecl/phar/trunk/zip.c
===
--- pecl/phar/trunk/zip.c 2009-07-24 15:42:17 UTC (rev 284707)
+++ pecl/phar/trunk/zip.c 2009-07-24 16:21:40 UTC (rev 284708)
@@ -2,7 +2,7 @@
+--+
| ZIP archive support for Phar |
+--+
- | Copyright (c) 2007-2008 The PHP Group|
+ | Copyright (c) 2007-2009 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
@@ -310,6 +310,9 @@
if (mydata->metadata) { \
zval_dtor(mydata->metadata); \
} \
+ if (mydata->signature) { \
+ efree(mydata->signature); \
+ } \
if (error) { \
spprintf(error, 4096, "phar error: %s in
zip-based phar \"%s\"", errmsg, mydata->fname); \
} \
@@ -331,6 +334,9 @@
if (mydata->metadata) { \
zval_dtor(mydata->metadata); \
} \
+ if (mydata->signature) { \
+ efree(mydata->signature); \
+ } \
if (error) { \
spprintf(error, 4096, "phar error: %s in
zip-based phar \"%s\"", errmsg, mydata->fname); \
} \
@@ -766,7 +772,6 @@
php_uint32 newcrc32;
off_t offset;
int not_really_modified = 0;
-
entry = (phar_entry_info *)data;
p = (struct _phar_zip_pass*) arg;
Modified: php/php-src/branches/PHP_5_3/ext/phar/zip.c
===
--- php/php-src/branches/PHP_5_3/ext/phar/zip.c 2009-07-24 15:42:17 UTC (rev
284707)
+++ php/php-src/branches/PHP_5_3/ext/phar/zip.c 2009-07-24 16:21:40 UTC (rev
284708)
@@ -310,6 +310,9 @@
if (mydata->metadata) { \
zval_dtor(mydata->metadata); \
} \
+ if (mydata->signature) { \
+ efree(mydata->signature); \
+ } \
if (error) { \
spprintf(error, 4096, "phar error: %s in
zip-based phar \"%s\"", errmsg, mydata->fname); \
} \
@@ -331,6 +334,9 @@
if (mydata->metadata) { \
zval_dtor(mydata->metadata); \
} \
+ if (mydata->signature) { \
+ efree(mydata->signature); \
+ } \
if (error) { \
spprintf(error, 4096, "phar error: %s in
zip-based phar \"%s\"", errmsg, mydata->fname); \
} \
Modified: php/php-src/trunk/ext/phar/zip.c
===
--- php/php-src/trunk/ext/phar/zip.c2009-07-24 15:42:17 UTC (rev 284707)
+++ php/php-src/trunk/ext/phar/zip.c2009-07-24 16:21:40 UTC (rev 284708)
@@ -310,6 +310,9 @@
if (mydata->metadata) { \
zval_dtor(mydata->metadata); \
} \
+ if (mydata->signature) { \
+ efree(mydata->signature); \
+ } \
if (error) { \
spprintf(error, 4096, "phar error: %s in
zip-based phar \"%s\"", errmsg, mydata->fname); \
} \
@@ -331,6 +334,9 @@
if (mydata->metadata) { \
zval_dtor(mydata->metadata); \
} \
+ if (mydata->signature) { \
+ efree(mydata->signature); \
+ } \
if (error) { \
spprintf(error, 4096, "phar error: %s in
zip-based phar \"%s\"", errmsg, mydata->fname); \
} \
@@ -766,7 +772,6 @@
php_uint32 newcrc32;
off_t offset;
int not_really_modified = 0;
-
entry = (p
