[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/Zend/zend_execute_API.c trunk/Zend/zend_execute_API.c
stas Thu, 30 Jul 2009 05:01:53 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286541
Log:
fix for bug #49000
Bug: http://bugs.php.net/49000 (Analyzed) PHP CLI in Interactive mode (php -a)
crashes when including files from function
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c
U php/php-src/trunk/Zend/zend_execute_API.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-30 03:54:27 UTC (rev 286540)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-30 05:01:53 UTC (rev 286541)
@@ -26,6 +26,8 @@
(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 #49000 (PHP CLI in Interactive mode (php -a) crashes
+ when including files from function). (Stas)
- 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_3/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c2009-07-30
03:54:27 UTC (rev 286540)
+++ php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c2009-07-30
05:01:53 UTC (rev 286541)
@@ -1148,6 +1148,7 @@
zval *local_retval_ptr=NULL;
zval **original_return_value_ptr_ptr = EG(return_value_ptr_ptr);
zend_op **original_opline_ptr = EG(opline_ptr);
+ int orig_interactive = CG(interactive);
EG(return_value_ptr_ptr) = &local_retval_ptr;
EG(active_op_array) = new_op_array;
@@ -1155,9 +1156,11 @@
if (!EG(active_symbol_table)) {
zend_rebuild_symbol_table(TSRMLS_C);
}
+ CG(interactive) = 0;
zend_execute(new_op_array TSRMLS_CC);
+ CG(interactive) = orig_interactive;
if (local_retval_ptr) {
if (retval_ptr) {
COPY_PZVAL_TO_ZVAL(*retval_ptr,
local_retval_ptr);
@@ -1216,6 +1219,7 @@
{
zend_op *opline, *end;
zend_op *ret_opline;
+ int orig_interactive;
if (!(CG(active_op_array)->fn_flags & ZEND_ACC_INTERACTIVE)
|| CG(active_op_array)->backpatch_count>0
@@ -1271,7 +1275,10 @@
EG(return_value_ptr_ptr) = NULL;
EG(active_op_array) = CG(active_op_array);
+ orig_interactive = CG(interactive);
+ CG(interactive) = 0;
zend_execute(CG(active_op_array) TSRMLS_CC);
+ CG(interactive) = orig_interactive;
if (EG(exception)) {
zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
Modified: php/php-src/trunk/Zend/zend_execute_API.c
===
--- php/php-src/trunk/Zend/zend_execute_API.c 2009-07-30 03:54:27 UTC (rev
286540)
+++ php/php-src/trunk/Zend/zend_execute_API.c 2009-07-30 05:01:53 UTC (rev
286541)
@@ -1241,6 +1241,7 @@
zval *local_retval_ptr=NULL;
zval **original_return_value_ptr_ptr = EG(return_value_ptr_ptr);
zend_op **original_opline_ptr = EG(opline_ptr);
+ int orig_interactive = CG(interactive);
EG(return_value_ptr_ptr) = &local_retval_ptr;
EG(active_op_array) = new_op_array;
@@ -1248,9 +1249,11 @@
if (!EG(active_symbol_table)) {
zend_rebuild_symbol_table(TSRMLS_C);
}
+ CG(interactive) = 0;
zend_execute(new_op_array TSRMLS_CC);
+ CG(interactive) = orig_interactive;
if (local_retval_ptr) {
if (retval_ptr) {
COPY_PZVAL_TO_ZVAL(*retval_ptr,
local_retval_ptr);
@@ -1333,6 +1336,7 @@
{
zend_op *opline, *end;
zend_op *ret_opline;
+ int orig_interactive;
if (!(CG(active_op_array)->fn_flags & ZEND_ACC_INTERACTIVE)
|| CG(active_op_array)->backpatch_count>0
@@ -1388,7 +1392,10 @@
EG(return_value_ptr_ptr) = NULL;
EG(active_op_array) = CG(active_op_array);
+ orig_interactive = CG(interactive);
+ CG(interactive) = 0;
zend_execute(CG(active_op_array) TSRMLS_CC);
+ CG(interactive) = orig_interactive;
if (EG(exception)) {
zend_exception_error(EG(exception), E_ERROR 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_2/ext/gd/tests/bug42434.phpt branches/PHP_5_3/ext/gd/tests/bug42434.phpt trunk/ext/gd/tests/bug42434.phpt
kalleThu, 30 Jul 2009 03:54:27 + Revision: http://svn.php.net/viewvc?view=revision&revision=286540 Log: Test case for bug #42434 Bug: http://bugs.php.net/42434 (Closed) ImageLine w/ antialias = 1px shorter Changed paths: A php/php-src/branches/PHP_5_2/ext/gd/tests/bug42434.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/bug42434.phpt A php/php-src/trunk/ext/gd/tests/bug42434.phpt Added: php/php-src/branches/PHP_5_2/ext/gd/tests/bug42434.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/bug42434.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/bug42434.phpt 2009-07-30 03:54:27 UTC (rev 286540) @@ -0,0 +1,26 @@ +--TEST-- +Bug #42434 (ImageLine w/ antialias = 1px shorter) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +DONE \ No newline at end of file Added: php/php-src/branches/PHP_5_3/ext/gd/tests/bug42434.phpt === --- php/php-src/branches/PHP_5_3/ext/gd/tests/bug42434.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/gd/tests/bug42434.phpt 2009-07-30 03:54:27 UTC (rev 286540) @@ -0,0 +1,26 @@ +--TEST-- +Bug #42434 (ImageLine w/ antialias = 1px shorter) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +DONE \ No newline at end of file Added: php/php-src/trunk/ext/gd/tests/bug42434.phpt === --- php/php-src/trunk/ext/gd/tests/bug42434.phpt (rev 0) +++ php/php-src/trunk/ext/gd/tests/bug42434.phpt2009-07-30 03:54:27 UTC (rev 286540) @@ -0,0 +1,26 @@ +--TEST-- +Bug #42434 (ImageLine w/ antialias = 1px shorter) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +DONE \ No newline at end of file -- 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
felipe Thu, 30 Jul 2009 00:18:48 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286539
Log:
- Added missing entries from me
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-29 23:28:47 UTC (rev 286538)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-30 00:18:48 UTC (rev 286539)
@@ -6,6 +6,7 @@
- Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz,
Stas)
- Fixed signature generation/validation for zip archives in ext/phar. (Greg)
+- Fixed memory leak in stream_is_local(). (Felipe)
- Fixed bug #49065 ("disable_functions" php.ini option does not work on
Zend extensions). (Stas)
@@ -25,10 +26,13 @@
(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 #48980 (Crash when compiling with pdo_firebird). (Felipe)
- 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 #48913 (Too long error code strings in pdo_odbc driver).
+ (naf at altlinux dot ru, Felipe)
- Fixed bug #48912 (Namespace causes unexpected strict behaviour with
extract()). (Dmitry)
- Fixed bug #48899 (is_callable returns true even if method does not exist in
@@ -46,6 +50,7 @@
Windows). (Pierre)
- Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at
gmail dot com, Pierre)
+- Fixed bug #48762 (IPv6 address filter still rejects valid address). (Felipe)
- 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)
@@ -66,6 +71,8 @@
- Fixed bug #48189 (ibase_execute error in return param). (Kalle)
- Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre,
Al dot Smith at aeschi dot ch dot eu dot org)
+- Fixed bug #48057 (Only the date fields of the first row are fetched,
+ others are empty). (info at programmiernutte dot net)
- Fixed bug #47481 (natcasesort() does not sort extended ASCII characters
correctly). (Herman Radtke)
- Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ .gdbinit
cellog Wed, 29 Jul 2009 23:18:41 + Revision: http://svn.php.net/viewvc?view=revision&revision=286537 Log: make dump_bt work with unicode function names Changed paths: U php/php-src/trunk/.gdbinit Modified: php/php-src/trunk/.gdbinit === --- php/php-src/trunk/.gdbinit 2009-07-29 23:04:36 UTC (rev 286536) +++ php/php-src/trunk/.gdbinit 2009-07-29 23:18:41 UTC (rev 286537) @@ -15,27 +15,6 @@ ZTS detection is automatically based on ext/standard module struct end -define dump_bt - set $t = $arg0 - while $t - printf "[0x%08x] ", $t - if $t->function_state.function->common.function_name - printf "%s() ", $t->function_state.function->common.function_name - else - printf "??? " - end - if $t->op_array != 0 - printf "%s:%d ", $t->op_array->filename, $t->opline->lineno - end - set $t = $t->prev_execute_data - printf "\n" - end -end - -document dump_bt - dumps the current execution stack. usage: dump_bt executor_globals.current_execute_data -end - define printztype printz_type $arg0 printf "\n" @@ -146,6 +125,28 @@ If unicode is 1 the function calls printu, else it uses printf. end +define dump_bt + set $t = $arg0 + while $t + printf "[0x%08x] ", $t + if $t->function_state.function->common.function_name + printu $t->function_state.function->common.function_name.u 50 + printf "() " + else + printf "??? " + end + if $t->op_array != 0 + printf "%s:%d ", $t->op_array->filename, $t->opline->lineno + end + set $t = $t->prev_execute_data + printf "\n" + end +end + +document dump_bt + dumps the current execution stack. usage: dump_bt executor_globals.current_execute_data +end + define printzv_contents set $zvalue = $arg0 set $type = $zvalue->type -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/streamsfuncs.c branches/PHP_5_3/ext/standard/streamsfuncs.c trunk/ext/standard/streamsfuncs.c
Felipe Pena wrote:
felipe Wed, 29 Jul 2009 19:09:17 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286531
Log:
- Fixed memleak in stream_is_local()
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
You forgot the PHP_5_3/NEWS..
--Jani
U php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c
U php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c
U php/php-src/trunk/ext/standard/streamsfuncs.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-07-29 19:07:33 UTC (rev 286530)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-29 19:09:17 UTC (rev 286531)
@@ -3,6 +3,7 @@
?? ??? 2009, PHP 5.2.11
- Fixed regression in cURL extension that prevented flush of data to output
defined as a file handle. (Ilia)
+- Fixed memory leak in stream_is_local(). (Felipe)
- Fixed bug #49052 (context option headers freed too early when using
--with-curlwrappers). (Jani)
Modified: php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c2009-07-29
19:07:33 UTC (rev 286530)
+++ php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c2009-07-29
19:09:17 UTC (rev 286531)
@@ -1399,6 +1399,7 @@
} else {
convert_to_string_ex(&zstream);
wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, 0 TSRMLS_CC);
+ zval_ptr_dtor(&zstream);
}
if(!wrapper) {
Modified: php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c2009-07-29
19:07:33 UTC (rev 286530)
+++ php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c2009-07-29
19:09:17 UTC (rev 286531)
@@ -1465,6 +1465,7 @@
} else {
convert_to_string_ex(&zstream);
wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, 0 TSRMLS_CC);
+ zval_ptr_dtor(&zstream);
}
if(!wrapper) {
Modified: php/php-src/trunk/ext/standard/streamsfuncs.c
===
--- php/php-src/trunk/ext/standard/streamsfuncs.c 2009-07-29 19:07:33 UTC
(rev 286530)
+++ php/php-src/trunk/ext/standard/streamsfuncs.c 2009-07-29 19:09:17 UTC
(rev 286531)
@@ -1752,6 +1752,7 @@
} else {
convert_to_string_ex(&zstream);
wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, 0 TSRMLS_CC);
+ zval_ptr_dtor(&zstream);
}
if(!wrapper) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: svn: /php/php-src/ branches/PHP_5_3/ext/phar/phar_object.c trunk/ext/phar/phar_object.c
Felipe Pena wrote: > felipe Wed, 29 Jul 2009 16:17:57 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=286518 > > Log: > - Fixed memleak on Phar::mungServer() > > Changed paths: > U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c > U php/php-src/trunk/ext/phar/phar_object.c Hi Felipe, don't forget pecl/phar/trunk/phar_object.c Thanks, Greg -- 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/streamsfuncs.c branches/PHP_5_3/ext/standard/streamsfuncs.c trunk/ext/standard/streamsfuncs.c
felipe Wed, 29 Jul 2009 19:09:17 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286531
Log:
- Fixed memleak in stream_is_local()
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c
U php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c
U php/php-src/trunk/ext/standard/streamsfuncs.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-07-29 19:07:33 UTC (rev 286530)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-29 19:09:17 UTC (rev 286531)
@@ -3,6 +3,7 @@
?? ??? 2009, PHP 5.2.11
- Fixed regression in cURL extension that prevented flush of data to output
defined as a file handle. (Ilia)
+- Fixed memory leak in stream_is_local(). (Felipe)
- Fixed bug #49052 (context option headers freed too early when using
--with-curlwrappers). (Jani)
Modified: php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c2009-07-29
19:07:33 UTC (rev 286530)
+++ php/php-src/branches/PHP_5_2/ext/standard/streamsfuncs.c2009-07-29
19:09:17 UTC (rev 286531)
@@ -1399,6 +1399,7 @@
} else {
convert_to_string_ex(&zstream);
wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, 0 TSRMLS_CC);
+ zval_ptr_dtor(&zstream);
}
if(!wrapper) {
Modified: php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c2009-07-29
19:07:33 UTC (rev 286530)
+++ php/php-src/branches/PHP_5_3/ext/standard/streamsfuncs.c2009-07-29
19:09:17 UTC (rev 286531)
@@ -1465,6 +1465,7 @@
} else {
convert_to_string_ex(&zstream);
wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, 0 TSRMLS_CC);
+ zval_ptr_dtor(&zstream);
}
if(!wrapper) {
Modified: php/php-src/trunk/ext/standard/streamsfuncs.c
===
--- php/php-src/trunk/ext/standard/streamsfuncs.c 2009-07-29 19:07:33 UTC
(rev 286530)
+++ php/php-src/trunk/ext/standard/streamsfuncs.c 2009-07-29 19:09:17 UTC
(rev 286531)
@@ -1752,6 +1752,7 @@
} else {
convert_to_string_ex(&zstream);
wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream),
NULL, 0 TSRMLS_CC);
+ zval_ptr_dtor(&zstream);
}
if(!wrapper) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ hook-common.inc.php
gwynne Wed, 29 Jul 2009 18:29:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286528
Log:
the ISO/UTF-8 junk should no longer be needed
Changed paths:
U SVNROOT/hook-common.inc.php
Modified: SVNROOT/hook-common.inc.php
===
--- SVNROOT/hook-common.inc.php 2009-07-29 17:35:19 UTC (rev 286527)
+++ SVNROOT/hook-common.inc.php 2009-07-29 18:29:12 UTC (rev 286528)
@@ -102,24 +102,13 @@
function find_user($author)
{
$usersDB = file(__DIR__ . '/users.db');
-$saw_last_ISO = FALSE;
foreach ($usersDB as $userline) {
list ($username, $fullname, $email) = explode(":", trim($userline));
-if ($username === 'ladderalice') {
-$saw_last_ISO = TRUE;
-}
if ($username === $author) {
-if ($saw_last_ISO !== TRUE) {
-$fullname = iconv("ISO-8859-1", "UTF-8//TRANSLIT", $fullname);
-}
-$result = array($fullname, $email);
-break;
+return array($fullname, $email);
}
}
-if (!isset($result)) {
-fail("No such user.\n");
-}
-return $result;
+fail("No such user.\n");
}
function common_prefix($str1, $str2)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
philip Wed, 29 Jul 2009 17:35:19 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286527
Log:
web/pecl -> pecl-...@lists.php.net
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-29 17:31:25 UTC (rev 286526)
+++ SVNROOT/commit-email.php2009-07-29 17:35:19 UTC (rev 286527)
@@ -22,6 +22,7 @@
'|^web/presentations|' => array('p...@lists.php.net'),
'|^web/pres2|' => array('p...@lists.php.net'),
'|^web/php|' => array('php-webmas...@lists.php.net'),
+'|^web/pecl|' => array('pecl-...@lists.php.net'),
// Zend/TSRM
'|^php/ZendAPI|' => array('zend-engine-...@lists.php.net',
'doc-...@lists.php.net'),
--
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/spl/ spl_directory.c
felipe Wed, 29 Jul 2009 17:31:25 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286526
Log:
- Fixed memleak on SplFileInfo::getLinkTarget()
Changed paths:
U php/php-src/trunk/ext/spl/spl_directory.c
Modified: php/php-src/trunk/ext/spl/spl_directory.c
===
--- php/php-src/trunk/ext/spl/spl_directory.c 2009-07-29 17:20:16 UTC (rev
286525)
+++ php/php-src/trunk/ext/spl/spl_directory.c 2009-07-29 17:31:25 UTC (rev
286526)
@@ -1132,7 +1132,7 @@
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
UChar *target;
int ret, link_len, target_len;
- char *link, buff[MAXPATHLEN];
+ char *link = NULL, buff[MAXPATHLEN];
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException,
&error_handling TSRMLS_CC);
@@ -1144,11 +1144,14 @@
}
#ifdef HAVE_SYMLINK
- ret = readlink(intern->file_name.s, buff, MAXPATHLEN-1);
+ ret = link ? readlink(link, buff, MAXPATHLEN-1) : -1;
#else
ret = -1; /* always fail if not implemented */
#endif
+ if (link && intern->file_name_type == IS_UNICODE) {
+ efree(link);
+ }
if (ret == -1) {
zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
"Unable to read link %R, error: %s", intern->file_name_type, intern->file_name,
strerror(errno));
RETVAL_FALSE;
--
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/package.xml php/php-src/branches/PHP_5_3/ext/phar/package.php php/php-src/branches/PHP_5_3/ext/phar/package.xml php/php-src/trunk/ext/phar/
cellog Wed, 29 Jul 2009 16:29:30 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286521
Log:
oops, released as beta instead of stable, Gwynne: svn rm tags/RELEASE_2_0_0
fails, perhaps this can be allowed?
Changed paths:
U pecl/phar/trunk/package.php
U pecl/phar/trunk/package.xml
U php/php-src/branches/PHP_5_3/ext/phar/package.php
U php/php-src/branches/PHP_5_3/ext/phar/package.xml
U php/php-src/trunk/ext/phar/package.php
U php/php-src/trunk/ext/phar/package.xml
Modified: pecl/phar/trunk/package.php
===
--- pecl/phar/trunk/package.php 2009-07-29 16:20:25 UTC (rev 286520)
+++ pecl/phar/trunk/package.php 2009-07-29 16:29:30 UTC (rev 286521)
@@ -124,8 +124,8 @@
$package->addRelease();
$package->setReleaseVersion(phpversion('phar'));
$package->setAPIVersion(Phar::apiVersion());
-$package->setReleaseStability('beta');
-$package->setAPIStability('beta');
+$package->setReleaseStability('stable');
+$package->setAPIStability('stable');
$package->setNotes("\n$notes\n");
//$package->addGlobalReplacement('package-info', '@package_version@',
'version');
$package->generateContents();
Modified: pecl/phar/trunk/package.xml
===
--- pecl/phar/trunk/package.xml 2009-07-29 16:20:25 UTC (rev 286520)
+++ pecl/phar/trunk/package.xml 2009-07-29 16:29:30 UTC (rev 286521)
@@ -49,8 +49,8 @@
1.1.1
- beta
- beta
+ stable
+ stable
http://www.php.net/license";>PHP License
Modified: php/php-src/branches/PHP_5_3/ext/phar/package.php
===
--- php/php-src/branches/PHP_5_3/ext/phar/package.php 2009-07-29 16:20:25 UTC
(rev 286520)
+++ php/php-src/branches/PHP_5_3/ext/phar/package.php 2009-07-29 16:29:30 UTC
(rev 286521)
@@ -124,8 +124,8 @@
$package->addRelease();
$package->setReleaseVersion(phpversion('phar'));
$package->setAPIVersion(Phar::apiVersion());
-$package->setReleaseStability('beta');
-$package->setAPIStability('beta');
+$package->setReleaseStability('stable');
+$package->setAPIStability('stable');
$package->setNotes("\n$notes\n");
//$package->addGlobalReplacement('package-info', '@package_version@',
'version');
$package->generateContents();
Modified: php/php-src/branches/PHP_5_3/ext/phar/package.xml
===
--- php/php-src/branches/PHP_5_3/ext/phar/package.xml 2009-07-29 16:20:25 UTC
(rev 286520)
+++ php/php-src/branches/PHP_5_3/ext/phar/package.xml 2009-07-29 16:29:30 UTC
(rev 286521)
@@ -49,8 +49,8 @@
1.1.1
- beta
- beta
+ stable
+ stable
http://www.php.net/license";>PHP License
Modified: php/php-src/trunk/ext/phar/package.php
===
--- php/php-src/trunk/ext/phar/package.php 2009-07-29 16:20:25 UTC (rev
286520)
+++ php/php-src/trunk/ext/phar/package.php 2009-07-29 16:29:30 UTC (rev
286521)
@@ -124,8 +124,8 @@
$package->addRelease();
$package->setReleaseVersion(phpversion('phar'));
$package->setAPIVersion(Phar::apiVersion());
-$package->setReleaseStability('beta');
-$package->setAPIStability('beta');
+$package->setReleaseStability('stable');
+$package->setAPIStability('stable');
$package->setNotes("\n$notes\n");
//$package->addGlobalReplacement('package-info', '@package_version@',
'version');
$package->generateContents();
Modified: php/php-src/trunk/ext/phar/package.xml
===
--- php/php-src/trunk/ext/phar/package.xml 2009-07-29 16:20:25 UTC (rev
286520)
+++ php/php-src/trunk/ext/phar/package.xml 2009-07-29 16:29:30 UTC (rev
286521)
@@ -49,8 +49,8 @@
1.1.1
- beta
- beta
+ stable
+ stable
http://www.php.net/license";>PHP License
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / pecl/phar/trunk/package.php pecl/phar/trunk/package.xml php/php-src/branches/PHP_5_3/ext/phar/package.php php/php-src/branches/PHP_5_3/ext/phar/package.xml php/php-src/trunk/ext/p
On Jul 29, 2009, at 12:29 PM, Greg Beaver wrote: cellog Wed, 29 Jul 2009 16:29:30 + Revision: http://svn.php.net/viewvc?view=revision&revision=286521 Log: oops, released as beta instead of stable, Gwynne: svn rm tags/ RELEASE_2_0_0 fails, perhaps this can be allowed? I disabled the tags check completely. It was causing a lot more problems than it solved, much like the keywords check. -- Gwynne -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pre-commit
gwynne Wed, 29 Jul 2009 17:09:15 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286524
Log:
Disable checks for commits to tags/. It was a good idea, but there are too many
cases where it would be legit and not enough cases of the protection being
needed.
Changed paths:
U SVNROOT/pre-commit
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2009-07-29 16:52:16 UTC (rev 286523)
+++ SVNROOT/pre-commit 2009-07-29 17:09:15 UTC (rev 286524)
@@ -34,6 +34,9 @@
if (strncmp($changed_path, "archived/", strlen("archived/")) === 0) {
fail("Commits to archived modules are not allowed.\n");
}
+
+/* Tags checks disabled. Too many special cases, not enough people making this
+mistake to make the extra work worth it.
// path contains "/tags/"
if (($tags_loc = strpos($changed_path, '/tags/')) !== FALSE) {
@@ -67,7 +70,7 @@
fail("Committing to a tag is not allowed.\n");
}
}
-
+*/
}
//
-
--
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/phar/phar_object.c trunk/ext/phar/phar_object.c
felipe Wed, 29 Jul 2009 16:17:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=286518 Log: - Fixed memleak on Phar::mungServer() Changed paths: U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c U php/php-src/trunk/ext/phar/phar_object.c 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-29 16:14:07 UTC (rev 286517) +++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-07-29 16:17:57 UTC (rev 286518) @@ -1027,6 +1027,7 @@ MAKE_STD_ZVAL(unicopy); *unicopy = **data; zval_copy_ctor(unicopy); + INIT_PZVAL(unicopy); zval_unicode_to_string(unicopy TSRMLS_CC); data = &unicopy; } Modified: php/php-src/trunk/ext/phar/phar_object.c === --- php/php-src/trunk/ext/phar/phar_object.c2009-07-29 16:14:07 UTC (rev 286517) +++ php/php-src/trunk/ext/phar/phar_object.c2009-07-29 16:17:57 UTC (rev 286518) @@ -1027,6 +1027,7 @@ MAKE_STD_ZVAL(unicopy); *unicopy = **data; zval_copy_ctor(unicopy); + INIT_PZVAL(unicopy); zval_unicode_to_string(unicopy TSRMLS_CC); data = &unicopy; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / pecl/phar/trunk/package.php pecl/phar/trunk/package.xml pecl/phar/trunk/phar_object.c pecl/phar/trunk/php_phar.h pecl/phar/trunk/tests/bug46032.phpt pecl/phar/trunk/tests/cache_li
Jani Taskinen wrote: > On 07/29/2009 01:14 PM, Greg Beaver wrote: >> cellog Wed, 29 Jul 2009 10:14:04 + >> >> Revision: http://svn.php.net/viewvc?view=revision&revision=286504 >> >> Log: >> make phar tests pass in php 5.2, prepare for release of pecl/phar >> 2.0.0, merge Gwynne's TSRM fix to phar_object.c to other branches >> >> Changed paths: > [snip] >> U php/php-src/trunk/run-tests.php > > Why the removing of that empty line in this file again..? :) > It's out of sync in other branches, again. Hi, Thanks for this catch, I had been peppering debug statements throughout run-tests.php to try to locate the cause of a recurring segfault before I figured out how to simply run "make test" within gdb, and must have thought there was no newline when I removed the debug statement there. It looks like occasionally values returned from internal functions (getcwd, getenv are 2 examples) that do RETURN_RT_STRING() have their unicode values efree()d, but this efree is erratic at best, so there must be some kind of corruption happening (yes, I did vcsclean and rebuild to eliminate PEBKAC) :) Greg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ run-tests.php
cellog Wed, 29 Jul 2009 16:14:07 + Revision: http://svn.php.net/viewvc?view=revision&revision=286517 Log: restore removed line (thanks Jani) Changed paths: U php/php-src/trunk/run-tests.php Modified: php/php-src/trunk/run-tests.php === --- php/php-src/trunk/run-tests.php 2009-07-29 15:41:21 UTC (rev 286516) +++ php/php-src/trunk/run-tests.php 2009-07-29 16:14:07 UTC (rev 286517) @@ -1140,6 +1140,7 @@ global $leak_check, $temp_source, $temp_target, $cfg, $environment; global $no_clean; global $valgrind_version; + $temp_filenames = null; $org_file = $file; -- 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/date/lib/ parse_date.c parse_date.re parse_iso_intervals.re
derick Wed, 29 Jul 2009 15:41:21 + Revision: http://svn.php.net/viewvc?view=revision&revision=286516 Log: - Fixed headers... #- It makes sense to change the .re files instead of just the generated .c # files... Changed paths: U php/php-src/trunk/ext/date/lib/parse_date.c U php/php-src/trunk/ext/date/lib/parse_date.re U php/php-src/trunk/ext/date/lib/parse_iso_intervals.re Modified: php/php-src/trunk/ext/date/lib/parse_date.c === --- php/php-src/trunk/ext/date/lib/parse_date.c 2009-07-29 15:34:59 UTC (rev 286515) +++ php/php-src/trunk/ext/date/lib/parse_date.c 2009-07-29 15:41:21 UTC (rev 286516) @@ -1,10 +1,10 @@ -/* Generated by re2c 0.13.5 on Wed Jul 29 16:31:12 2009 */ +/* Generated by re2c 0.13.5 on Wed Jul 29 16:40:36 2009 */ #line 1 "ext/date/lib/parse_date.re" /* +--+ - | PHP Version 5| + | PHP Version 6| +--+ - | Copyright (c) 1997-2006 The PHP Group| + | Copyright (c) 1997-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: php/php-src/trunk/ext/date/lib/parse_date.re === --- php/php-src/trunk/ext/date/lib/parse_date.re2009-07-29 15:34:59 UTC (rev 286515) +++ php/php-src/trunk/ext/date/lib/parse_date.re2009-07-29 15:41:21 UTC (rev 286516) @@ -1,8 +1,8 @@ /* +--+ - | PHP Version 5| + | PHP Version 6| +--+ - | Copyright (c) 1997-2006 The PHP Group| + | Copyright (c) 1997-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: php/php-src/trunk/ext/date/lib/parse_iso_intervals.re === --- php/php-src/trunk/ext/date/lib/parse_iso_intervals.re 2009-07-29 15:34:59 UTC (rev 286515) +++ php/php-src/trunk/ext/date/lib/parse_iso_intervals.re 2009-07-29 15:41:21 UTC (rev 286516) @@ -1,8 +1,8 @@ /* +--+ - | PHP Version 5| + | PHP Version 6| +--+ - | Copyright (c) 1997-2006 The PHP Group| + | Copyright (c) 1997-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| -- 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/date/lib/parse_date.c branches/PHP_5_3/ext/date/lib/parse_date.re branches/PHP_5_3/ext/date/tests/bug45554.phpt trunk/ext/date/l
derick Wed, 29 Jul 2009 15:34:59 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286515
Log:
- Fixed bug #45554 (Inconsistent behavior of the u format char).
Bug: http://bugs.php.net/45554 (Assigned) Inconsistent behavior of the u format
char
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c
U php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.re
A php/php-src/branches/PHP_5_3/ext/date/tests/bug45554.phpt
U php/php-src/trunk/ext/date/lib/parse_date.c
U php/php-src/trunk/ext/date/lib/parse_date.re
A php/php-src/trunk/ext/date/tests/bug45554.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-29 15:29:59 UTC (rev 286514)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-29 15:34:59 UTC (rev 286515)
@@ -80,6 +80,7 @@
(Sriram Natarajan)
- Fixed bug #48182 (ssl handshake fails during asynchronous socket connection).
(Sriram Natarajan)
+- Fixed bug #45554 (Inconsistent behavior of the u format char). (Derick)
- Fixed bug #42434 (ImageLine w/ antialias = 1px shorter). (wojjie at gmail dot
com, Kalle)
Modified: php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c
===
--- php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c 2009-07-29
15:29:59 UTC (rev 286514)
+++ php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c 2009-07-29
15:34:59 UTC (rev 286515)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Dec 18 14:58:43 2008 */
+/* Generated by re2c 0.13.5 on Wed Jul 29 16:20:12 2009 */
#line 1 "ext/date/lib/parse_date.re"
/*
+--+
@@ -24086,10 +24086,18 @@
add_pbf_error(s, "A two digit second
could not be found", string, begin);
}
break;
- case 'u': /* five digit millisecond, with leading zero
*/
- TIMELIB_CHECK_NUMBER;
- if ((s->time->f = timelib_get_nr((char **)
&ptr, 5)) == TIMELIB_UNSET) {
- add_pbf_error(s, "A five digit
millisecond could not be found", string, begin);
+ case 'u': /* six digit millisecond */
+ {
+ double f;
+ char *tptr;
+
+ TIMELIB_CHECK_NUMBER;
+ tptr = ptr;
+ if ((f = timelib_get_nr((char **) &ptr,
6)) == TIMELIB_UNSET || ptr - tptr != 6) {
+ add_pbf_error(s, "A six digit
millisecond could not be found", string, begin);
+ } else {
+ s->time->f = (f / 100);
+ }
}
break;
case ' ': /* any sort of whitespace (' ' and \t) */
Modified: php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.re
===
--- php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.re 2009-07-29
15:29:59 UTC (rev 286514)
+++ php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.re 2009-07-29
15:34:59 UTC (rev 286515)
@@ -1943,10 +1943,18 @@
add_pbf_error(s, "A two digit second
could not be found", string, begin);
}
break;
- case 'u': /* five digit millisecond, with leading zero
*/
- TIMELIB_CHECK_NUMBER;
- if ((s->time->f = timelib_get_nr((char **)
&ptr, 5)) == TIMELIB_UNSET) {
- add_pbf_error(s, "A five digit
millisecond could not be found", string, begin);
+ case 'u': /* six digit millisecond */
+ {
+ double f;
+ char *tptr;
+
+ TIMELIB_CHECK_NUMBER;
+ tptr = ptr;
+ if ((f = timelib_get_nr((char **) &ptr,
6)) == TIMELIB_UNSET || ptr - tptr != 6) {
+ add_pbf_error(s, "A six digit
millisecond could not be found", string, begin);
+ } else {
+ s->time->f = (f / 100);
+ }
[PHP-CVS] svn: /web/pecl/trunk/public_html/ account-request.php
philip Wed, 29 Jul 2009 14:46:28 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286512
Log:
CVS->SVN
Changed paths:
U web/pecl/trunk/public_html/account-request.php
Modified: web/pecl/trunk/public_html/account-request.php
===
--- web/pecl/trunk/public_html/account-request.php 2009-07-29 14:40:12 UTC
(rev 286511)
+++ web/pecl/trunk/public_html/account-request.php 2009-07-29 14:46:28 UTC
(rev 286512)
@@ -43,7 +43,7 @@
'email',
'moreinfo',
'homepage',
- 'needcvs',
+ 'needsvn',
'showemail');
foreach ($fields as $field) {
@@ -112,7 +112,7 @@
$md5pw = md5($password);
$showemail = @(bool)$showemail;
-$needcvs = @(bool)$needcvs;
+$needsvn = @(bool)$needsvn;
// hack to temporarily embed the "purpose" in
// the user's "userinfo" column
@@ -138,10 +138,10 @@
break;
}
-/* Now do the CVS stuff */
-if ($needcvs) {
+/* Now do the SVN stuff */
+if ($needsvn) {
$error = posttohost(
-'http://master.php.net/entry/cvs-account.php',
+'http://master.php.net/entry/svn-account.php',
array(
"username" => $handle,
"name" => $name,
@@ -152,7 +152,7 @@
);
if ($error) {
-display_error("Problem submitting the CVS account request:
$error");
+display_error("Problem submitting the SVN account request:
$error");
break;
}
}
@@ -162,7 +162,7 @@
"Real Name:{$name}\n".
"Email:{$email}".
(@$showemail ? " (show address)" : " (hide address)") .
"\n".
- "Need CVS Account: " . (@$needcvs ? "yes" : "no") . "\n".
+ "Need SVN Account: " . (@$needsvn ? "yes" : "no") . "\n".
"Purpose:\n".
"$purpose\n\n".
"To handle: http://"; . PEAR_CHANNELNAME .
"/admin/?acreq={$handle}\n";
@@ -201,7 +201,7 @@
response_header("Request Account");
-$cs_link=
make_link('http://cvs.php.net/viewvc.cgi/php-src/CODING_STANDARDS', 'PHP Coding
Standards');
+$cs_link=
make_link('http://svn.php.net/viewvc/php/php-src/trunk/CODING_STANDARDS', 'PHP
Coding Standards');
$lic_link_pecl = make_link('http://www.php.net/license/3_01.txt', 'PHP
License 3.01');
$lic_link_doc = make_link('http://www.php.net/manual/en/cc.license.php',
'Creative Commons Attribution License');
$doc_howto_pecl = make_link('http://wiki.php.net/doc/howto/pecldocs',
'PECL Docs Howto');
@@ -261,8 +261,8 @@
- If approved, you will also apply for a
CVS account
- in order to commit the code to the php.net CVS repository.
+ If approved, you will also apply for a
SVN account
+ in order to commit the code to the php.net SVN repository.
@@ -339,7 +339,7 @@
$bb->horizHeadRow("First Name:", HTML_Form::returnText("firstname",
$firstname));
$bb->horizHeadRow("Last Name:", HTML_Form::returnText("lastname",
$lastname));
$bb->horizHeadRow("Password:", HTML_Form::returnPassword("password", null,
10) . " Again: " . HTML_Form::returnPassword("password2", null, 10));
-$bb->horizHeadRow("Need a CVS account?",
HTML_Form::returnCheckbox("needcvs", $needcvs));
+$bb->horizHeadRow("Need a SVN account?",
HTML_Form::returnCheckbox("needsvn", $needsvn));
$bb->horizHeadRow("Email address:", HTML_Form::returnText("email",
$email));
$bb->horizHeadRow("Show email address?",
HTML_Form::returnCheckbox("showemail", $showemail));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_interfaces.c
felipe Wed, 29 Jul 2009 14:27:43 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286510
Log:
- Fixed expected data type for class name (%s -> %v)
Changed paths:
U php/php-src/trunk/Zend/zend_interfaces.c
Modified: php/php-src/trunk/Zend/zend_interfaces.c
===
--- php/php-src/trunk/Zend/zend_interfaces.c2009-07-29 13:51:52 UTC (rev
286509)
+++ php/php-src/trunk/Zend/zend_interfaces.c2009-07-29 14:27:43 UTC (rev
286510)
@@ -483,13 +483,13 @@
ZEND_API int zend_class_serialize_deny(zval *object, int *type, zstr *buffer,
zend_uint *buf_len, zend_serialize_data *data TSRMLS_DC) /* {{{ */
{
zend_class_entry *ce = Z_OBJCE_P(object);
- zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Serialization of '%s' is
not allowed", ce->name);
+ zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Serialization of '%v' is
not allowed", ce->name);
return FAILURE;
} /* }}} */
ZEND_API int zend_class_unserialize_deny(zval **object, zend_class_entry *ce,
int type, const zstr buf, zend_uint buf_len, zend_unserialize_data *data
TSRMLS_DC) /* {{{ */
{
- zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Unserialization of '%s' is
not allowed", ce->name);
+ zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Unserialization of '%v' is
not allowed", ce->name);
return FAILURE;
} /* }}} */
--
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/.project PHP_5_3/.project
johannes Wed, 29 Jul 2009 13:51:52 + Revision: http://svn.php.net/viewvc?view=revision&revision=286509 Log: Remove .project files (doesn't exist in trunk) Changed paths: D php/php-src/branches/PHP_5_2/.project D php/php-src/branches/PHP_5_3/.project Deleted: php/php-src/branches/PHP_5_2/.project === --- php/php-src/branches/PHP_5_2/.project 2009-07-29 13:44:16 UTC (rev 286508) +++ php/php-src/branches/PHP_5_2/.project 2009-07-29 13:51:52 UTC (rev 286509) @@ -1,11 +0,0 @@ - - - php-5.2 - - - - - - - - Deleted: php/php-src/branches/PHP_5_3/.project === --- php/php-src/branches/PHP_5_3/.project 2009-07-29 13:44:16 UTC (rev 286508) +++ php/php-src/branches/PHP_5_3/.project 2009-07-29 13:51:52 UTC (rev 286509) @@ -1,11 +0,0 @@ - - - php-5.3 - - - - - - - - -- 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/head.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/head.c trunk/ext/standard/head.c
iliaaWed, 29 Jul 2009 13:44:16 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286508
Log:
Fixed bug #45141 (setcookie will output expires years of >4 digits).
Bug: http://bugs.php.net/45141 (Assigned) [PATCH] setcookie will output expires
years of >4 digits
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/standard/head.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/head.c
U php/php-src/trunk/ext/standard/head.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-07-29 12:50:19 UTC (rev 286507)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-29 13:44:16 UTC (rev 286508)
@@ -69,6 +69,7 @@
(Sriram Natarajan)
- Fixed bug #48182 (ssl handshake fails during asynchronous socket connection).
(Sriram Natarajan)
+- Fixed bug #45141 (setcookie will output expires years of >4 digits). (Ilia)
- Fixed bug #44144 (spl_autoload_functions() should return object instance
when appropriate). (Hannes, Etienne)
- Fixed bug #42434 (ImageLine w/ antialias = 1px shorter). (wojjie at gmail dot
Modified: php/php-src/branches/PHP_5_2/ext/standard/head.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/head.c2009-07-29 12:50:19 UTC
(rev 286507)
+++ php/php-src/branches/PHP_5_2/ext/standard/head.c2009-07-29 13:44:16 UTC
(rev 286508)
@@ -110,8 +110,18 @@
} else {
snprintf(cookie, len + 100, "Set-Cookie: %s=%s", name, value ?
encoded_value : "");
if (expires > 0) {
+ char *p;
strlcat(cookie, "; expires=", len + 100);
dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D,
d-M-Y H:i:s T")-1, expires, 0 TSRMLS_CC);
+ /* check to make sure that the year does not exceed 4
digits in length */
+ p = zend_memrchr(dt, '-', strlen(dt));
+ if (*(p + 5) != ' ') {
+ efree(dt);
+ efree(cookie);
+ efree(encoded_value);
+ zend_error(E_WARNING, "Expiry date cannot have
a year greater then ");
+ return FAILURE;
+ }
strlcat(cookie, dt, len + 100);
efree(dt);
}
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-29 12:50:19 UTC (rev 286507)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-29 13:44:16 UTC (rev 286508)
@@ -73,6 +73,7 @@
(Pierre)
- Fixed bug #45905 (imagefilledrectangle() clipping error).
(markril at hotmail dot com, Pierre)
+- Fixed bug #45141 (setcookie will output expires years of >4 digits). (Ilia)
- Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo).
(Kalle, Rick Yorgason)
- Fixed bug #48774 (SIGSEGVs when using curl_copy_handle()).
Modified: php/php-src/branches/PHP_5_3/ext/standard/head.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/head.c2009-07-29 12:50:19 UTC
(rev 286507)
+++ php/php-src/branches/PHP_5_3/ext/standard/head.c2009-07-29 13:44:16 UTC
(rev 286508)
@@ -124,8 +124,18 @@
} else {
snprintf(cookie, len + 100, "Set-Cookie: %s=%s", name, value ?
encoded_value : "");
if (expires > 0) {
+ char *p;
strlcat(cookie, "; expires=", len + 100);
dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D,
d-M-Y H:i:s T")-1, expires, 0 TSRMLS_CC);
+ /* check to make sure that the year does not exceed 4
digits in length */
+ p = zend_memrchr(dt, '-', strlen(dt));
+ if (*(p + 5) != ' ') {
+ efree(dt);
+ efree(cookie);
+ efree(encoded_value);
+ zend_error(E_WARNING, "Expiry date cannot have
a year greater then ");
+ return FAILURE;
+ }
strlcat(cookie, dt, len + 100);
efree(dt);
}
Modified: php/php-src/trunk/ext/standard/head.c
===
--- php/php-src/trunk/ext/standard/head.c 2009-07-29 12:50:19 UTC (rev
286507)
+++ php/php-src/trunk/ext/standard/head.c 2009-07-29 13:44:16 UTC (rev
286508)
@@ -125,8 +125,18 @@
} else {
snprintf(cookie, len + 100, "Set-Cookie: %s=%s",
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS
jani Wed, 29 Jul 2009 12:50:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=286507 Log: - fuck bom Changed paths: U php/php-src/branches/PHP_5_2/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-07-29 11:32:47 UTC (rev 286506) +++ php/php-src/branches/PHP_5_2/NEWS 2009-07-29 12:50:19 UTC (rev 286507) @@ -1,4 +1,4 @@ -PHP NEWS +PHPNEWS ||| ?? ??? 2009, PHP 5.2.11 - Fixed regression in cURL extension that prevented flush of data to output -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / pecl/phar/trunk/package.php pecl/phar/trunk/package.xml pecl/phar/trunk/phar_object.c pecl/phar/trunk/php_phar.h pecl/phar/trunk/tests/bug46032.phpt pecl/phar/trunk/tests/cache_li
On 07/29/2009 01:14 PM, Greg Beaver wrote: cellog Wed, 29 Jul 2009 10:14:04 + Revision: http://svn.php.net/viewvc?view=revision&revision=286504 Log: make phar tests pass in php 5.2, prepare for release of pecl/phar 2.0.0, merge Gwynne's TSRM fix to phar_object.c to other branches Changed paths: [snip] U php/php-src/trunk/run-tests.php Why the removing of that empty line in this file again..? :) It's out of sync in other branches, again. --Jani -- 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/run-tests.php PHP_5_3/run-tests.php
cellog Wed, 29 Jul 2009 10:06:55 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286503
Log:
sync run-tests.php with revision 286499 changes making php 6 tests with EXPECTF
that can have arbitrary binary data in output work
Changed paths:
U php/php-src/branches/PHP_5_2/run-tests.php
U php/php-src/branches/PHP_5_3/run-tests.php
Modified: php/php-src/branches/PHP_5_2/run-tests.php
===
--- php/php-src/branches/PHP_5_2/run-tests.php 2009-07-29 10:05:12 UTC (rev 286502)
+++ php/php-src/branches/PHP_5_2/run-tests.php 2009-07-29 10:06:55 UTC (rev 286503)
@@ -1023,7 +1023,7 @@
{
global $leak_check, $cwd;
- $data = '';
+ $data = b'';
$bin_env = array();
foreach((array)$env as $key => $value) {
@@ -1059,23 +1059,23 @@
break;
} else if ($n === 0) {
/* timed out */
- $data .= "\n ** ERROR: process timed out **\n";
+ $data .= b"\n ** ERROR: process timed out **\n";
proc_terminate($proc);
return $data;
} else if ($n > 0) {
- $line = fread($pipes[1], 8192);
+ $line = (binary) fread($pipes[1], 8192);
if (strlen($line) == 0) {
/* EOF */
break;
}
- $data .= (binary) $line;
+ $data .= $line;
}
}
$stat = proc_get_status($proc);
if ($stat['signaled']) {
- $data .= "\nTermsig=" . $stat['stopsig'];
+ $data .= b"\nTermsig=" . $stat['stopsig'];
}
$code = proc_close($proc);
@@ -1140,7 +1140,6 @@
global $leak_check, $temp_source, $temp_target, $cfg, $environment;
global $no_clean;
global $valgrind_version;
-
$temp_filenames = null;
$org_file = $file;
@@ -1649,7 +1648,7 @@
COMMAND $cmd
";
- $out = system_with_timeout($cmd, $env, isset($section_text['STDIN']) ? $section_text['STDIN'] : null);
+ $out = (binary) system_with_timeout($cmd, $env, isset($section_text['STDIN']) ? $section_text['STDIN'] : null);
if (array_key_exists('CLEAN', $section_text) && (!$no_clean || $cfg['keep']['clean'])) {
@@ -1686,19 +1685,19 @@
}
// Does the output match what is expected?
- $output = preg_replace("/\r\n/", "\n", trim($out));
+ $output = preg_replace(b"/\r\n/", b"\n", trim($out));
/* when using CGI, strip the headers from the output */
- $headers = "";
+ $headers = b"";
- if (isset($old_php) && preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $out, $match)) {
+ if (isset($old_php) && preg_match(b"/^(.*?)\r?\n\r?\n(.*)/s", $out, $match)) {
$output = trim($match[2]);
- $rh = preg_split("/[\n\r]+/", $match[1]);
+ $rh = preg_split(b"/[\n\r]+/", $match[1]);
$headers = array();
foreach ($rh as $line) {
- if (strpos($line, ':') !== false) {
-$line = explode(':', $line, 2);
+ if (strpos($line, b':') !== false) {
+$line = explode(b':', $line, 2);
$headers[trim($line[0])] = trim($line[1]);
}
}
@@ -1709,13 +1708,13 @@
if (isset($section_text['EXPECTHEADERS'])) {
$want = array();
$wanted_headers = array();
- $lines = preg_split("/[\n\r]+/", $section_text['EXPECTHEADERS']);
+ $lines = preg_split(b"/[\n\r]+/", (binary) $section_text['EXPECTHEADERS']);
foreach($lines as $line) {
- if (strpos($line, ':') !== false) {
-$line = explode(':', $line, 2);
+ if (strpos($line, b':') !== false) {
+$line = explode(b':', $line, 2);
$want[trim($line[0])] = trim($line[1]);
-$wanted_headers[] = trim($line[0]) . ': ' . trim($line[1]);
+$wanted_headers[] = trim($line[0]) . b': ' . trim($line[1]);
}
}
@@ -1727,7 +1726,7 @@
if (isset($org_headers[$k])) {
$headers = $org_headers[$k];
-$output_headers[] = $k . ': ' . $org_headers[$k];
+$output_headers[] = $k . b': ' . $org_headers[$k];
}
if (!isset($org_headers[$k]) || $org_headers[$k] != $v) {
@@ -1736,9 +1735,9 @@
}
ksort($wanted_headers);
- $wanted_headers = join("\n", $wanted_headers);
+ $wanted_headers = join(b"\n", $wanted_headers);
ksort($output_headers);
- $output_headers = join("\n", $output_headers);
+ $output_headers = join(b"\n", $output_headers);
}
show_file_block('out', $output);
@@ -1752,13 +1751,13 @@
}
show_file_block('exp', $wanted);
- $wanted_re = preg_replace('/\r\n/', "\n", $wanted);
+ $wanted_re = preg_replace(b'/\r\n/', b"\n", $wanted);
if (isset($section_text['EXPECTF'])) {
// do preg_quote, but miss out any %r delimited sections
- $temp = "";
- $r = "%r";
+ $temp = b"";
+ $r = b"%r";
$startOffset = 0;
$length = strlen($wanted_re);
while($startOffset < $length) {
@@ -1775,45 +1774,45 @@
$start = $end = $length;
}
// quote a non re portion of the string
-$temp = $temp . preg_quote(substr($wanted_re, $startOffset, ($start - $startOffset)), '/');
+$temp = $temp . preg_quote(substr($wanted_re, $startOffset, ($start - $startOffset)), b'/');
// add the re unquoted.
-$temp = $temp . '(' . substr($wanted_re, $start+2, ($end - $start-2)). ')';
+$temp = $temp . b'(' . substr($wanted_re, $start+2
Re: [PHP-CVS] svn: /php/php-src/trunk/ run-tests.php
On 07/29/2009 12:22 PM, Greg Beaver wrote: cellog Wed, 29 Jul 2009 09:22:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=286499 Log: fix EXPECTF tests that have binary in their output by always processing output and expected output as binary Changed paths: U php/php-src/trunk/run-tests.php This file should be same in all branches. Please sync it with the others too. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ run-tests.php
cellog Wed, 29 Jul 2009 09:22:57 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286499
Log:
fix EXPECTF tests that have binary in their output by always processing output
and expected output as binary
Changed paths:
U php/php-src/trunk/run-tests.php
Modified: php/php-src/trunk/run-tests.php
===
--- php/php-src/trunk/run-tests.php 2009-07-29 09:10:52 UTC (rev 286498)
+++ php/php-src/trunk/run-tests.php 2009-07-29 09:22:57 UTC (rev 286499)
@@ -1023,7 +1023,7 @@
{
global $leak_check, $cwd;
- $data = '';
+ $data = b'';
$bin_env = array();
foreach((array)$env as $key => $value) {
@@ -1059,23 +1059,23 @@
break;
} else if ($n === 0) {
/* timed out */
- $data .= "\n ** ERROR: process timed out **\n";
+ $data .= b"\n ** ERROR: process timed out **\n";
proc_terminate($proc);
return $data;
} else if ($n > 0) {
- $line = fread($pipes[1], 8192);
+ $line = (binary) fread($pipes[1], 8192);
if (strlen($line) == 0) {
/* EOF */
break;
}
- $data .= (binary) $line;
+ $data .= $line;
}
}
$stat = proc_get_status($proc);
if ($stat['signaled']) {
- $data .= "\nTermsig=" . $stat['stopsig'];
+ $data .= b"\nTermsig=" . $stat['stopsig'];
}
$code = proc_close($proc);
@@ -1649,7 +1649,7 @@
COMMAND $cmd
";
- $out = system_with_timeout($cmd, $env, isset($section_text['STDIN']) ? $section_text['STDIN'] : null);
+ $out = (binary) system_with_timeout($cmd, $env, isset($section_text['STDIN']) ? $section_text['STDIN'] : null);
if (array_key_exists('CLEAN', $section_text) && (!$no_clean || $cfg['keep']['clean'])) {
@@ -1686,19 +1686,19 @@
}
// Does the output match what is expected?
- $output = preg_replace("/\r\n/", "\n", trim($out));
+ $output = preg_replace(b"/\r\n/", b"\n", trim($out));
/* when using CGI, strip the headers from the output */
- $headers = "";
+ $headers = b"";
- if (isset($old_php) && preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $out, $match)) {
+ if (isset($old_php) && preg_match(b"/^(.*?)\r?\n\r?\n(.*)/s", $out, $match)) {
$output = trim($match[2]);
- $rh = preg_split("/[\n\r]+/", $match[1]);
+ $rh = preg_split(b"/[\n\r]+/", $match[1]);
$headers = array();
foreach ($rh as $line) {
- if (strpos($line, ':') !== false) {
-$line = explode(':', $line, 2);
+ if (strpos($line, b':') !== false) {
+$line = explode(b':', $line, 2);
$headers[trim($line[0])] = trim($line[1]);
}
}
@@ -1709,13 +1709,13 @@
if (isset($section_text['EXPECTHEADERS'])) {
$want = array();
$wanted_headers = array();
- $lines = preg_split("/[\n\r]+/", $section_text['EXPECTHEADERS']);
+ $lines = preg_split(b"/[\n\r]+/", (binary) $section_text['EXPECTHEADERS']);
foreach($lines as $line) {
- if (strpos($line, ':') !== false) {
-$line = explode(':', $line, 2);
+ if (strpos($line, b':') !== false) {
+$line = explode(b':', $line, 2);
$want[trim($line[0])] = trim($line[1]);
-$wanted_headers[] = trim($line[0]) . ': ' . trim($line[1]);
+$wanted_headers[] = trim($line[0]) . b': ' . trim($line[1]);
}
}
@@ -1727,7 +1727,7 @@
if (isset($org_headers[$k])) {
$headers = $org_headers[$k];
-$output_headers[] = $k . ': ' . $org_headers[$k];
+$output_headers[] = $k . b': ' . $org_headers[$k];
}
if (!isset($org_headers[$k]) || $org_headers[$k] != $v) {
@@ -1736,9 +1736,9 @@
}
ksort($wanted_headers);
- $wanted_headers = join("\n", $wanted_headers);
+ $wanted_headers = join(b"\n", $wanted_headers);
ksort($output_headers);
- $output_headers = join("\n", $output_headers);
+ $output_headers = join(b"\n", $output_headers);
}
show_file_block('out', $output);
@@ -1752,13 +1752,13 @@
}
show_file_block('exp', $wanted);
- $wanted_re = preg_replace('/\r\n/', "\n", $wanted);
+ $wanted_re = preg_replace(b'/\r\n/', b"\n", $wanted);
if (isset($section_text['EXPECTF'])) {
// do preg_quote, but miss out any %r delimited sections
- $temp = "";
- $r = "%r";
+ $temp = b"";
+ $r = b"%r";
$startOffset = 0;
$length = strlen($wanted_re);
while($startOffset < $length) {
@@ -1775,45 +1775,45 @@
$start = $end = $length;
}
// quote a non re portion of the string
-$temp = $temp . preg_quote(substr($wanted_re, $startOffset, ($start - $startOffset)), '/');
+$temp = $temp . preg_quote(substr($wanted_re, $startOffset, ($start - $startOffset)), b'/');
// add the re unquoted.
-$temp = $temp . '(' . substr($wanted_re, $start+2, ($end - $start-2)). ')';
+$temp = $temp . b'(' . substr($wanted_re, $start+2, ($end - $start-2)). b')';
$startOffset = $end + 2;
}
$wanted_re = $temp;
$wanted_re = str_replace(
-array('%binary_string_optional%'),
-version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' : 'binary string',
+array(b'%binary_string_optional%'),
+version_compare(PHP
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_3/NEWS
jani Wed, 29 Jul 2009 09:10:52 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286498
Log:
- Fix news
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_3/NEWS
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-07-29 08:28:26 UTC (rev 286497)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-29 09:10:52 UTC (rev 286498)
@@ -1,7 +1,6 @@
PHP
NEWS
|||
?? ??? 2009, PHP 5.2.11
-- Fixed bug #48645 (mb_convert_encoding() doesn't understand hexadecimal
html-entities). (Moriyoshi)
- Fixed regression in cURL extension that prevented flush of data to output
defined as a file handle. (Ilia)
@@ -35,6 +34,8 @@
- Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly
formatted). (peter at lvp-media dot com, Felipe)
- Fixed bug #48661 (phpize is broken with non-bash shells). (Jani)
+- Fixed bug #48645 (mb_convert_encoding() doesn't understand hexadecimal
+ html-entities). (Moriyoshi)
- Fixed bug #48637 ("file" fopen wrapper is overwritten when using
--with-curlwrappers). (Jani)
- Fixed bug #48636 (Error compiling of ext/date on netware). (guenter at
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-29 08:28:26 UTC (rev 286497)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-29 09:10:52 UTC (rev 286498)
@@ -55,6 +55,8 @@
components). (Ilia)
- Fixed bug #48681 (openssl signature verification for tar archives broken).
(Greg)
+- Fixed bug #48645 (mb_convert_encoding() doesn't understand hexadecimal
+ html-entities). (Moriyoshi)
- Fixed bug #48637 ("file" fopen wrapper is overwritten when using
--with-curlwrappers). (Jani)
- Fixed bug #48377 (error message unclear on converting phar with existing
file).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
Not critical enough to merge to PHP_5_2 or some other reason..?
--Jani
On 07/29/2009 03:18 AM, Stanislav Malyshev wrote:
stas Wed, 29 Jul 2009 00:18:19 +
Revision: http://svn.php.net/viewvc?view=revision&revision=286479
Log:
report fix for bug #49065
Bug: http://bugs.php.net/49065 (Verified) "disable_functions" php.ini option
does not work on Zend extensions
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-29 00:17:10 UTC (rev 286478)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-29 00:18:19 UTC (rev 286479)
@@ -7,6 +7,8 @@
Stas)
- Fixed signature generation/validation for zip archives in ext/phar. (Greg)
+- Fixed bug #49065 ("disable_functions" php.ini option does not work on
+ Zend extensions). (Stas)
- Fixed bug #49064 (--enable-session=shared does not work: undefined symbol:
php_url_scanner_reset_vars). (Jani)
- Fixed bug #49052 (context option headers freed too early when using
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
