[PHP-CVS] com karma: Replace author by committer date in mail date header: lib/Git/PostReceiveHook.php
Commit:f63ee4060239525713ba87016908d06fa75d903d
Author:Alexander Moskaliov ir...@php.net Tue, 1 May 2012 11:40:32
+0400
Parents: bc220ca91ec470baab210cb652c22f10abc689c6
Branches: master
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=f63ee4060239525713ba87016908d06fa75d903d
Log:
Replace author by committer date in mail date header
Changed paths:
M lib/Git/PostReceiveHook.php
Diff:
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index e331101..f43a160 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -549,7 +549,7 @@ class PostReceiveHook extends ReceiveHook
$mail = new \Mail();
$mail-setSubject($this-emailPrefix . 'com ' .
$this-getRepositoryShortName() . ': ' . $info['subject'] . ': '. implode(' ',
array_keys($paths)));
-$mail-setTimestamp(strtotime($info['author_date']));
+$mail-setTimestamp(strtotime($info['committer_date']));
$message = '';
--
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_4/ NEWS ext/zlib/tests/bug61139.phpt ext/zlib/zlib_fopen_wrapper.c
Why is this test creating the file in the root directory?
And should it be created at all since the function fails?
-Hannes
On Fri, Mar 2, 2012 at 15:16, Nikita Popov ni...@php.net wrote:
nikic Fri, 02 Mar 2012 14:16:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=323819
Log:
Merge: Fix bug #61139: gzopen leaks when specifying invalid mode
Bug: https://bugs.php.net/61139 (Assigned) gzopen leaks when specifying
invalid mode
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
A php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61139.phpt
U php/php-src/branches/PHP_5_4/ext/zlib/zlib_fopen_wrapper.c
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2012-03-02 14:08:11 UTC (rev 323818)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-03-02 14:16:47 UTC (rev 323819)
@@ -43,6 +43,9 @@
- XMLRPC:
. Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikita
Popov)
+- Zlib:
+ . Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikita
Popov)
+
01 Mar 2012, PHP 5.4.0
- Installation:
Added: php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61139.phpt
===
--- php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61139.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61139.phpt 2012-03-02
14:16:47 UTC (rev 323819)
@@ -0,0 +1,14 @@
+--TEST--
+Bug #61139 (gzopen leaks when specifying invalid mode)
+--SKIPIF--
+?php
+if (!extension_loaded('zlib')) {
+ die('skip - zlib extension not loaded');
+}
+?
+--FILE--
+?php
+
+gzopen('someFile', 'c');
+--EXPECTF--
+Warning: gzopen(): gzopen failed in %s on line %d
Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_4/ext/zlib/zlib_fopen_wrapper.c 2012-03-02
14:08:11 UTC (rev 323818)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib_fopen_wrapper.c 2012-03-02
14:16:47 UTC (rev 323819)
@@ -109,7 +109,7 @@
php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char
*mode, int options,
char **opened_path,
php_stream_context *context STREAMS_DC TSRMLS_DC)
{
- struct php_gz_stream_data_t *self = {0};
+ struct php_gz_stream_data_t *self;
php_stream *stream = NULL, *innerstream = NULL;
/* sanity check the stream: it can be either read-only or write-only */
@@ -120,8 +120,6 @@
return NULL;
}
- self = emalloc(sizeof(*self));
-
if (strncasecmp(compress.zlib://, path, 16) == 0) {
path += 16;
} else if (strncasecmp(zlib:, path, 5) == 0) {
@@ -134,32 +132,29 @@
int fd;
if (SUCCESS == php_stream_cast(innerstream, PHP_STREAM_AS_FD,
(void **) fd, REPORT_ERRORS)) {
- self-gz_file = gzdopen(dup(fd), mode);
+ self = emalloc(sizeof(*self));
self-stream = innerstream;
- if (self-gz_file) {
+ self-gz_file = gzdopen(dup(fd), mode);
+
+ if (self-gz_file) {
stream =
php_stream_alloc_rel(php_stream_gzio_ops, self, 0, mode);
if (stream) {
stream-flags |=
PHP_STREAM_FLAG_NO_BUFFER;
return stream;
}
+
gzclose(self-gz_file);
}
+
+ efree(self);
if (options REPORT_ERRORS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
gzopen failed);
}
- } else if (innerstream) {
- php_stream_close(innerstream);
}
- }
- if (stream) {
- php_stream_close(stream);
+ php_stream_close(innerstream);
}
-
- if (self) {
- efree(self);
- }
-
+
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix masking in bug61115-1.phpt: ext/standard/tests/streams/bug61115-1.phpt
Commit:c864b1ca2f7bfaee43795085df7ee5b739c9aa5f Author:Christopher Jones s...@php.net Tue, 1 May 2012 14:32:09 -0700 Parents: d26e006d7f01db6fab3942ebbf073beaabf57e2d Branches: PHP-5.3 PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c864b1ca2f7bfaee43795085df7ee5b739c9aa5f Log: Fix masking in bug61115-1.phpt The test bug61115-1.phpt was diffing for non-debug builds Bugs: https://bugs.php.net/61115 Changed paths: M ext/standard/tests/streams/bug61115-1.phpt Diff: diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt index 573496e..89374e7 100644 --- a/ext/standard/tests/streams/bug61115-1.phpt +++ b/ext/standard/tests/streams/bug61115-1.phpt @@ -8,4 +8,4 @@ stream_context_get_options($fileResourceTemp); ftruncate($fileResourceTemp, PHP_INT_MAX); ? --EXPECTF-- -Fatal error: Allowed memory size of %d bytes exhausted %s (tried to allocate %d bytes) in %s on line %d +Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Make output order for dom007.phpt platform independent: ext/dom/tests/dom007.phpt
Commit:d14f23365cda4e830aa09fcf1d64c07c4fde21c9
Author:Christopher Jones s...@php.net Tue, 1 May 2012 15:43:31
-0700
Parents: 02e25df8b5a7c60364c7153c03da59de3a556a87
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d14f23365cda4e830aa09fcf1d64c07c4fde21c9
Log:
Make output order for dom007.phpt platform independent
This test has long been near the top of the reported output diffs.
For example, on http://qa.php.net/reports/?version=5.4.0 it has diffed
1307 times out of 3543 reports, at time of this commit. (The second
highest diff has occurred 710 times.)
Changed paths:
M ext/dom/tests/dom007.phpt
Diff:
diff --git a/ext/dom/tests/dom007.phpt b/ext/dom/tests/dom007.phpt
index 649d630..5d12aa3 100644
--- a/ext/dom/tests/dom007.phpt
+++ b/ext/dom/tests/dom007.phpt
@@ -63,12 +63,24 @@ echo \n;
$ents = $dtd-entities;
$length = $ents-length;
echo Length: .$length.\n;
+
+$xkeys = array();
foreach ($ents AS $key=$node) {
- echo Key: $key Name: .$node-nodeName.\n;
+ $xkeys[] = Key: $key Name: .$node-nodeName.\n;
+}
+sort($xkeys); // fix inconsistent output ordering (bug #61810)
+foreach ($xkeys as $key = $node) {
+ echo $node;
}
echo \n;
+
+$xkeys = array();
for($x=0; $x $length; $x++) {
- echo Index $x: .$ents-item($x)-nodeName.\n;
+ $xkeys[] = Index: .$ents-item($x)-nodeName.\n;
+}
+sort($xkeys); // fix inconsistent output ordering (bug #61810)
+foreach ($xkeys as $key = $node) {
+ echo $node;
}
echo \n;
@@ -87,13 +99,13 @@ Index 0: GIF (image/gif) (-)
NULL
Length: 3
-Key: test Name: test
-Key: rdf Name: rdf
Key: myimage Name: myimage
+Key: rdf Name: rdf
+Key: test Name: test
-Index 0: test
-Index 1: rdf
-Index 2: myimage
+Index: myimage
+Index: rdf
+Index: test
NULL
NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Make output order for dom007.phpt platform independent: ext/dom/tests/dom007.phpt
On Wed, May 2, 2012 at 6:43 AM, Christopher Jones s...@php.net wrote:
Commit: d14f23365cda4e830aa09fcf1d64c07c4fde21c9
Author: Christopher Jones s...@php.net Tue, 1 May 2012 15:43:31
-0700
Parents: 02e25df8b5a7c60364c7153c03da59de3a556a87
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d14f23365cda4e830aa09fcf1d64c07c4fde21c9
Log:
Make output order for dom007.phpt platform independent
This test has long been near the top of the reported output diffs.
For example, on http://qa.php.net/reports/?version=5.4.0 it has diffed
1307 times out of 3543 reports, at time of this commit. (The second
highest diff has occurred 710 times.)
thanks for the fix :)
Changed paths:
M ext/dom/tests/dom007.phpt
Diff:
diff --git a/ext/dom/tests/dom007.phpt b/ext/dom/tests/dom007.phpt
index 649d630..5d12aa3 100644
--- a/ext/dom/tests/dom007.phpt
+++ b/ext/dom/tests/dom007.phpt
@@ -63,12 +63,24 @@ echo \n;
$ents = $dtd-entities;
$length = $ents-length;
echo Length: .$length.\n;
+
+$xkeys = array();
foreach ($ents AS $key=$node) {
- echo Key: $key Name: .$node-nodeName.\n;
+ $xkeys[] = Key: $key Name: .$node-nodeName.\n;
+}
+sort($xkeys); // fix inconsistent output ordering (bug #61810)
+foreach ($xkeys as $key = $node) {
+ echo $node;
}
echo \n;
+
+$xkeys = array();
for($x=0; $x $length; $x++) {
- echo Index $x: .$ents-item($x)-nodeName.\n;
+ $xkeys[] = Index: .$ents-item($x)-nodeName.\n;
+}
+sort($xkeys); // fix inconsistent output ordering (bug #61810)
+foreach ($xkeys as $key = $node) {
+ echo $node;
}
echo \n;
@@ -87,13 +99,13 @@ Index 0: GIF (image/gif) (-)
NULL
Length: 3
-Key: test Name: test
-Key: rdf Name: rdf
Key: myimage Name: myimage
+Key: rdf Name: rdf
+Key: test Name: test
-Index 0: test
-Index 1: rdf
-Index 2: myimage
+Index: myimage
+Index: rdf
+Index: test
NULL
NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Laruence Xinchen Hui
http://www.laruence.com/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
