[PHP-CVS] com php-src: Disable email notifications for travis-ci: .travis.yml
Commit:0d85a86bbb151537a2362f17224d076556252ada Author:David Soria Parra Fri, 8 Jun 2012 22:56:02 +0200 Parents: d1debecd90ea334713a909f5b7ec64416283cf48 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0d85a86bbb151537a2362f17224d076556252ada Log: Disable email notifications for travis-ci Changed paths: M .travis.yml Diff: diff --git a/.travis.yml b/.travis.yml index 5995773..2939e3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,7 @@ php: - 5.4 notifications: -email: -recipients: -- php...@lists.php.net -on_success: never # [always|never|change] default: change -on_failure: never # [always|never|change] default: always +email: false env: - REPORT_EXIT_STATUS=1 TEST_PHP_EXECUTABLE=./sapi/cli/php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: rearrange news: NEWS
Commit:c4cc43169c0ae05127eb406fcfd837597b72b71e Author:Stanislav Malyshev Fri, 8 Jun 2012 13:27:24 -0700 Parents: ba8333cdb0feafbdbe2b7ae07532236c3b043b25 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c4cc43169c0ae05127eb406fcfd837597b72b71e Log: rearrange news Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index ee7dc76..17d1c58 100644 --- a/NEWS +++ b/NEWS @@ -1,13 +1,12 @@ PHPNEWS ||| ?? ??? 2012, PHP 5.4.5 -- Zend Engine: - . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that -includes a semi-colon). (Pierrick) - Core: . Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution). (Dmitry) + . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that +includes a semi-colon). (Pierrick) . Fixed potential overflow in _php_stream_scandir. (Jason Powell, Stas) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: typo: Zend/zend_compile.c
Commit:d1debecd90ea334713a909f5b7ec64416283cf48
Author:Stanislav Malyshev Fri, 8 Jun 2012 01:24:49
-0700
Parents: c83457ed13deabd296dcfb17f3e104572878763e
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d1debecd90ea334713a909f5b7ec64416283cf48
Log:
typo
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index b09e43c..5b991e8 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1685,7 +1685,7 @@ void zend_do_begin_function_declaration(znode
*function_token, znode *function_n
zval key;
if (CG(current_namespace)) {
- /* Prefix function name with current namespcae name */
+ /* Prefix function name with current namespace name */
znode tmp;
tmp.u.constant = *CG(current_namespace);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: typo: Zend/zend_compile.c
Commit:ba8333cdb0feafbdbe2b7ae07532236c3b043b25
Author:Stanislav Malyshev Fri, 8 Jun 2012 01:24:49
-0700
Parents: c467e81c86b3f4d312459553c23792492009a917
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=ba8333cdb0feafbdbe2b7ae07532236c3b043b25
Log:
typo
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 28f9824..cca7c19 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1685,7 +1685,7 @@ void zend_do_begin_function_declaration(znode
*function_token, znode *function_n
zval key;
if (CG(current_namespace)) {
- /* Prefix function name with current namespcae name */
+ /* Prefix function name with current namespace name */
znode tmp;
tmp.u.constant = *CG(current_namespace);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: typo: Zend/zend_compile.c
Commit:17c0ff11949f81c5fb5b32f6f64b3e8ad4063aeb
Author:Stanislav Malyshev Fri, 8 Jun 2012 01:24:49
-0700
Parents: fc74503792b1ee92e4b813690890f3ed38fa3ad5
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=17c0ff11949f81c5fb5b32f6f64b3e8ad4063aeb
Log:
typo
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 17454f8..4c31f7c 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1336,7 +1336,7 @@ void zend_do_begin_function_declaration(znode
*function_token, znode *function_n
zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
if (CG(current_namespace)) {
- /* Prefix function name with current namespcae name */
+ /* Prefix function name with current namespace name */
znode tmp;
tmp.u.constant = *CG(current_namespace);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS File: NEWS
Commit:c467e81c86b3f4d312459553c23792492009a917 Author:Pierrick Charron Fri, 8 Jun 2012 18:02:49 +0200 Parents: 59eaa7c877e6bacb4783f929b924e2582c4a82f1 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c467e81c86b3f4d312459553c23792492009a917 Log: NEWS File Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 348a06e..ee7dc76 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ PHPNEWS ||| ?? ??? 2012, PHP 5.4.5 +- Zend Engine: + . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that +includes a semi-colon). (Pierrick) - Core: . Fixed bug #61998 (Using traits with method aliases appears to result in @@ -55,6 +58,7 @@ PHP NEWS - XML Writer: . Fixed bug #62064 (memory leak in the XML Writer module). (jean-pierre dot lozi at lip6 dot fr) + - Zip: . Upgraded libzip to 0.10.1 (Anatoliy) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com karma: fix char's case problem: lib/Git/PostReceiveHook.php
Commit:0f4a8cdd72b0fabce293a9206db6b5710cbc9d76
Author:Alexander Moskaliov Fri, 8 Jun 2012 17:36:47
+0400
Parents: f63ee4060239525713ba87016908d06fa75d903d
Branches: master
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=0f4a8cdd72b0fabce293a9206db6b5710cbc9d76
Log:
fix char's case problem
Changed paths:
M lib/Git/PostReceiveHook.php
Diff:
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index f43a160..336c4e9 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -486,7 +486,7 @@ class PostReceiveHook extends ReceiveHook
$bugs = [];
if
(preg_match_all('/(?:(pecl|pear|php)\s*)?(?:bug|#)[\s#:]*([0-9]+)/iuX', $log,
$matchedBugs, PREG_SET_ORDER)) {
foreach($matchedBugs as $bug) {
-$bugs[$bug[2]] = $bugUrlPrefixes[$bug[1]] . $bug[2];
+$bugs[$bug[2]] = $bugUrlPrefixes[strtolower($bug[1])] .
$bug[2];
}
}
return $bugs;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: add NEWS: NEWS
hi! Please add the CVE # too. Thanks! On Fri, Jun 8, 2012 at 8:11 AM, Stanislav Malyshev wrote: > Commit: 0e3a650e748b2bf79147d76a4739e17f3817c10c > Author: Stanislav Malyshev Thu, 7 Jun 2012 23:11:28 > -0700 > Parents: 10e8da1738dc5331c595524837e69fd17ad9236a > Branches: PHP-5.4 > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=0e3a650e748b2bf79147d76a4739e17f3817c10c > > Log: > add NEWS > > Changed paths: > M NEWS > > > Diff: > diff --git a/NEWS b/NEWS > index 31a6218..348a06e 100644 > --- a/NEWS > +++ b/NEWS > @@ -5,6 +5,8 @@ PHP > NEWS > - Core: > . Fixed bug #61998 (Using traits with method aliases appears to result in > crash during execution). (Dmitry) > + . Fixed potential overflow in _php_stream_scandir. (Jason Powell, > + Stas) > > - EXIF: > . Fixed information leak in ext exif (discovered by Martin Noga, > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': main/streams/streams.c
Commit:c83457ed13deabd296dcfb17f3e104572878763e Author:Stanislav Malyshev Fri, 8 Jun 2012 01:23:07 -0700 Parents: 426ccd3e7f9aabc5d4e3b97a51d2c19ba44871d5 59eaa7c877e6bacb4783f929b924e2582c4a82f1 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c83457ed13deabd296dcfb17f3e104572878763e Log: Merge branch 'PHP-5.4' * PHP-5.4: improve overflow checks add NEWS fix potential overflow in _php_stream_scandir Changed paths: MM main/streams/streams.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: improve overflow checks: main/streams/streams.c
Commit:fc74503792b1ee92e4b813690890f3ed38fa3ad5
Author:Stanislav Malyshev Fri, 8 Jun 2012 01:21:37
-0700
Parents: 7d04e0fb2ec8be9b1c4b16a9f0b4958f853597f1
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=fc74503792b1ee92e4b813690890f3ed38fa3ad5
Log:
improve overflow checks
Changed paths:
M main/streams/streams.c
Diff:
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 43cb010..dfd6094 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -2279,6 +2279,11 @@ PHPAPI int _php_stream_scandir(char *dirname, char
**namelist[], int flags, php_
if (vector_size == 0) {
vector_size = 10;
} else {
+ if(vector_size*2 < vector_size) {
+ /* overflow */
+ efree(vector);
+ return FAILURE;
+ }
vector_size *= 2;
}
vector = (char **) safe_erealloc(vector, vector_size,
sizeof(char *), 0);
@@ -2287,11 +2292,6 @@ PHPAPI int _php_stream_scandir(char *dirname, char
**namelist[], int flags, php_
vector[nfiles] = estrdup(sdp.d_name);
nfiles++;
- if(vector_size < 10 || nfiles == 0) {
- /* overflow */
- efree(vector);
- return FAILURE;
- }
}
php_stream_closedir(stream);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: main/streams/streams.c
Commit:59eaa7c877e6bacb4783f929b924e2582c4a82f1 Author:Stanislav Malyshev Fri, 8 Jun 2012 01:22:46 -0700 Parents: 0e3a650e748b2bf79147d76a4739e17f3817c10c fc74503792b1ee92e4b813690890f3ed38fa3ad5 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59eaa7c877e6bacb4783f929b924e2582c4a82f1 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: improve overflow checks fix potential overflow in _php_stream_scandir Changed paths: MM main/streams/streams.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
