granicus.if.org Git

Xinchen Hui [Fri, 10 Apr 2015 14:48:36 +0000 (22:48 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

Xinchen Hui [Fri, 10 Apr 2015 14:47:06 +0000 (22:47 +0800)]

Fixed bug #69420 (Invalid read in zend_std_get_method)

Dmitry Stogov [Wed, 8 Apr 2015 18:24:24 +0000 (21:24 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

commit | commitdiff | tree

Dmitry Stogov [Wed, 8 Apr 2015 18:22:25 +0000 (21:22 +0300)]

Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

commit | commitdiff | tree

Dmitry Stogov [Wed, 8 Apr 2015 18:20:35 +0000 (21:20 +0300)]

Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

commit | commitdiff | tree

Ferenc Kovacs [Wed, 8 Apr 2015 17:00:21 +0000 (19:00 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix irc notification for build failure/recover

commit | commitdiff | tree

Ferenc Kovacs [Wed, 8 Apr 2015 17:00:03 +0000 (19:00 +0200)]

fix irc notification for build failure/recover

commit | commitdiff | tree

Dmitry Stogov [Wed, 8 Apr 2015 12:54:10 +0000 (15:54 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed typo

commit | commitdiff | tree

Dmitry Stogov [Wed, 8 Apr 2015 12:53:28 +0000 (15:53 +0300)]

commit | commitdiff | tree

Nikita Popov [Mon, 6 Apr 2015 20:06:48 +0000 (22:06 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_compile.c
Zend/zend_compile.h

commit | commitdiff | tree

Nikita Popov [Mon, 6 Apr 2015 20:03:04 +0000 (22:03 +0200)]

commit | commitdiff | tree

Nikita Popov [Mon, 6 Apr 2015 19:44:52 +0000 (21:44 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Nikita Popov [Mon, 6 Apr 2015 19:37:19 +0000 (21:37 +0200)]

Fix static member destruction

commit | commitdiff | tree

Dmitry Stogov [Mon, 6 Apr 2015 15:16:08 +0000 (18:16 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #68652 (segmentation fault in destructor)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Mon, 6 Apr 2015 15:11:41 +0000 (18:11 +0300)]

Fixed bug #68652 (segmentation fault in destructor)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 6 Apr 2015 05:48:37 +0000 (22:48 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #68740 (NULL Pointer Dereference)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 6 Apr 2015 05:48:27 +0000 (22:48 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #68740 (NULL Pointer Dereference)

commit | commitdiff | tree

Xinchen Hui [Tue, 31 Mar 2015 21:41:46 +0000 (00:41 +0300)]

Fixed bug #68740 (NULL Pointer Dereference)

(cherry picked from commit 124fb22a13fafa3648e4e15b4f207c7096d8155e)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 6 Apr 2015 05:38:03 +0000 (22:38 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #66550 (SQLite prepared statement use-after-free)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 6 Apr 2015 05:36:55 +0000 (22:36 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #66550 (SQLite prepared statement use-after-free)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 6 Apr 2015 05:27:02 +0000 (22:27 -0700)]

Fix bug #66550 (SQLite prepared statement use-after-free)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 6 Apr 2015 00:37:12 +0000 (17:37 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.

commit | commitdiff | tree

Stanislav Malyshev [Mon, 6 Apr 2015 00:36:52 +0000 (17:36 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.

commit | commitdiff | tree

Remi Collet [Wed, 17 Dec 2014 09:59:36 +0000 (10:59 +0100)]

Better fix for #68601 for perf
https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467

commit | commitdiff | tree

Remi Collet [Sat, 13 Dec 2014 08:03:44 +0000 (09:03 +0100)]

Fix bug #68601 buffer read overflow in gd_gif_in.c

commit | commitdiff | tree

Ferenc Kovacs [Sun, 5 Apr 2015 20:54:57 +0000 (22:54 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
add travis failure/recover notification for our irc room

commit | commitdiff | tree

Ferenc Kovacs [Sun, 5 Apr 2015 20:54:30 +0000 (22:54 +0200)]

add travis failure/recover notification for our irc room

commit | commitdiff | tree

Anatol Belski [Sat, 4 Apr 2015 19:50:50 +0000 (21:50 +0200)]

commit | commitdiff | tree

Anatol Belski [Sat, 4 Apr 2015 19:50:18 +0000 (21:50 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  added test for bug #69354
  revert skipif, this should run everywhere
  further ODBC 3.0 compliance
  more compliance with the ODBC 3.0
  test fixes

commit | commitdiff | tree

Anatol Belski [Sat, 4 Apr 2015 19:49:09 +0000 (21:49 +0200)]

updated NEWS

fixes for bug #69354 was cherrypicked from master

commit | commitdiff | tree

Anatol Belski [Thu, 2 Apr 2015 16:50:16 +0000 (18:50 +0200)]

added test for bug #69354

commit | commitdiff | tree

Anatol Belski [Thu, 2 Apr 2015 13:37:08 +0000 (15:37 +0200)]

revert skipif, this should run everywhere

commit | commitdiff | tree

Anatol Belski [Thu, 2 Apr 2015 13:30:31 +0000 (15:30 +0200)]

further ODBC 3.0 compliance

commit | commitdiff | tree

Anatol Belski [Thu, 2 Apr 2015 12:23:23 +0000 (14:23 +0200)]

more compliance with the ODBC 3.0

commit | commitdiff | tree

Anatol Belski [Thu, 2 Apr 2015 12:22:56 +0000 (14:22 +0200)]

commit | commitdiff | tree

Dmitry Stogov [Thu, 2 Apr 2015 09:30:58 +0000 (12:30 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.

commit | commitdiff | tree

Dmitry Stogov [Thu, 2 Apr 2015 09:29:15 +0000 (12:29 +0300)]

Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.

commit | commitdiff | tree

Stanislav Malyshev [Thu, 2 Apr 2015 06:43:33 +0000 (23:43 -0700)]

Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"

This reverts commit fe0ca2745f00940a27bfc8e87db534541a19af70, reversing
changes made to 968fbc6acf0bc27be17c0209be7f966e89a55943.

commit | commitdiff | tree

Xinchen Hui [Thu, 2 Apr 2015 01:06:46 +0000 (09:06 +0800)]

Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Thu, 2 Apr 2015 01:06:38 +0000 (09:06 +0800)]

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

commit | commitdiff | tree

Ferenc Kovacs [Wed, 1 Apr 2015 22:07:13 +0000 (00:07 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
sigh, can't even copypaste without screwing up

commit | commitdiff | tree

Ferenc Kovacs [Wed, 1 Apr 2015 22:07:00 +0000 (00:07 +0200)]

sigh, can't even copypaste without screwing up

commit | commitdiff | tree

Ferenc Kovacs [Wed, 1 Apr 2015 21:06:22 +0000 (23:06 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
oop, put both the error number and message for both db object to the error message

commit | commitdiff | tree

Ferenc Kovacs [Wed, 1 Apr 2015 21:06:04 +0000 (23:06 +0200)]

oop, put both the error number and message for both db object to the error message

commit | commitdiff | tree

Ferenc Kovacs [Wed, 1 Apr 2015 20:08:11 +0000 (22:08 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
test fixes

commit | commitdiff | tree

Ferenc Kovacs [Wed, 1 Apr 2015 20:03:19 +0000 (22:03 +0200)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 1 Apr 2015 19:48:08 +0000 (12:48 -0700)]

Revert "Merge branch 'PHP-5.5' into PHP-5.6"

This reverts commit aa22e80b1af500e5d6cdc0f7783537a768d0e373, reversing
changes made to 3e7f47cb039fd8803776eaf2899d576c503cdb63.

Conflicts:
ext/date/php_date.c

commit | commitdiff | tree

Ferenc Kovacs [Wed, 1 Apr 2015 16:05:57 +0000 (18:05 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix typo: unitialized -> uninitialized

commit | commitdiff | tree

Ferenc Kovacs [Wed, 1 Apr 2015 16:05:36 +0000 (18:05 +0200)]

Merge branch 'pr-1212' into PHP-5.5

* pr-1212:
Fix typo: unitialized -> uninitialized

commit | commitdiff | tree

Xinchen Hui [Wed, 1 Apr 2015 16:01:57 +0000 (00:01 +0800)]

commit | commitdiff | tree

Xinchen Hui [Wed, 1 Apr 2015 15:59:45 +0000 (23:59 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

Fixed bug #69281 (opcache_is_script_cached no longer works)

commit | commitdiff | tree

Lior Kaplan [Wed, 1 Apr 2015 15:21:01 +0000 (18:21 +0300)]

Fix typo: unitialized -> uninitialized

commit | commitdiff | tree

Lior Kaplan [Wed, 1 Apr 2015 15:20:26 +0000 (18:20 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix typo: unitialized -> uninitialized

commit | commitdiff | tree

Lior Kaplan [Wed, 1 Apr 2015 15:19:09 +0000 (18:19 +0300)]

Fix typo: unitialized -> uninitialized

commit | commitdiff | tree

Lior Kaplan [Wed, 1 Apr 2015 15:07:37 +0000 (18:07 +0300)]

Fix typo: unitialized -> uninitialized

commit | commitdiff | tree

Ferenc Kovacs [Tue, 31 Mar 2015 23:42:12 +0000 (01:42 +0200)]

commit | commitdiff | tree

Ferenc Kovacs [Tue, 31 Mar 2015 23:30:51 +0000 (01:30 +0200)]

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 22:55:35 +0000 (01:55 +0300)]

Add changelog entries for #68677, #68739 & #68740

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 22:54:53 +0000 (01:54 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68739 (Missing break / control flow in curl)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fixed bug #68677 (Use After Free in OPcache)

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 22:45:34 +0000 (01:45 +0300)]

Fixed bug #68739 (Missing break / control flow).
Fixed bug #68740 (NULL Pointer Dereference).
Fixed bug #68677 (Use After Free).

commit | commitdiff | tree

Xinchen Hui [Tue, 31 Mar 2015 21:57:39 +0000 (00:57 +0300)]

Fixed bug #68739 (Missing break / control flow in curl)

(cherry picked from commit 124fb22a13fafa3648e4e15b4f207c7096d8155e)

commit | commitdiff | tree

Xinchen Hui [Tue, 31 Mar 2015 21:41:46 +0000 (00:41 +0300)]

Fixed bug #68740 (NULL Pointer Dereference)

(cherry picked from commit 124fb22a13fafa3648e4e15b4f207c7096d8155e)

commit | commitdiff | tree

Xinchen Hui [Thu, 8 Jan 2015 08:32:20 +0000 (16:32 +0800)]

Fixed bug #68677 (Use After Free in OPcache)

(cherry picked from commit 777c39f4042327eac4b63c7ee87dc1c7a09a3115)

commit | commitdiff | tree

Derick Rethans [Tue, 31 Mar 2015 15:35:10 +0000 (16:35 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 31 Mar 2015 15:35:03 +0000 (16:35 +0100)]

Fixed bug #69336 (Issues with "last day of <monthname>").

commit | commitdiff | tree

Julien Pauli [Tue, 31 Mar 2015 13:57:44 +0000 (15:57 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
5.5.25 now

commit | commitdiff | tree

Julien Pauli [Tue, 31 Mar 2015 13:51:47 +0000 (15:51 +0200)]

commit | commitdiff | tree

Derick Rethans [Tue, 31 Mar 2015 10:09:23 +0000 (11:09 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 31 Mar 2015 10:08:56 +0000 (11:08 +0100)]

Export date_get_immutable_ce() so that extensions can make use of it too.

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 06:26:34 +0000 (09:26 +0300)]

Align entries format

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 06:24:56 +0000 (09:24 +0300)]

Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 06:23:34 +0000 (09:23 +0300)]

Add CVE for bug #69207

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 06:20:29 +0000 (09:20 +0300)]

Align NEWS entries with 5.6.7

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 06:17:13 +0000 (09:17 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Align entries format
  Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
  Add CVE for bug #69207

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 06:14:06 +0000 (09:14 +0300)]

Align entries format

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 06:12:05 +0000 (09:12 +0300)]

Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710

commit | commitdiff | tree

Lior Kaplan [Tue, 31 Mar 2015 06:11:21 +0000 (09:11 +0300)]

Add CVE for bug #69207

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 14:27:08 +0000 (16:27 +0200)]

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 14:25:47 +0000 (16:25 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #64931

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 14:19:17 +0000 (16:19 +0200)]

Fixed bug #64931

phar_add_file is too restrive on filename

Check for any of '/', '\\', '\0' after ".phar".

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 13:41:36 +0000 (15:41 +0200)]

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 13:41:03 +0000 (15:41 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed Bug #65467

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 13:39:30 +0000 (15:39 +0200)]

Fixed Bug #65467

Call to undefined method cli_arg_typ_string

Use cli_arg_typ_filecontent instead.

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 12:43:02 +0000 (14:43 +0200)]

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 12:42:37 +0000 (14:42 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix bug #67761

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 12:41:30 +0000 (14:41 +0200)]

fix bug #67761

Phar::mapPhar fails for Phars inside a path containing ".tar".

Strengthen the silly .tar file extension check.

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 11:48:57 +0000 (13:48 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug 64343

; Lesson learned: do not rebase on a merge commit

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 11:09:32 +0000 (13:09 +0200)]

Fixed bug 64343

PharData::extractTo fails for tarball created by BSD tar

Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.

commit | commitdiff | tree

Michael Wallner [Mon, 30 Mar 2015 11:09:32 +0000 (13:09 +0200)]

Fixed bug 64343

PharData::extractTo fails for tarball created by BSD tar

Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.

commit | commitdiff | tree

Dmitry Stogov [Fri, 27 Mar 2015 15:40:58 +0000 (18:40 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Add RAND_egd check for compiling against LibreSSL

Add RAND_egd check for compiling against LibreSSL

commit | commitdiff | tree

Lior Kaplan [Wed, 25 Mar 2015 17:32:25 +0000 (19:32 +0200)]

Add CVE for bug #68901

commit | commitdiff | tree

Lior Kaplan [Wed, 25 Mar 2015 17:31:05 +0000 (19:31 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Add CVE for bug #68901

commit | commitdiff | tree

Lior Kaplan [Wed, 25 Mar 2015 17:26:40 +0000 (19:26 +0200)]

Add CVE for bug #68901

commit | commitdiff | tree

Xinchen Hui [Wed, 25 Mar 2015 15:27:50 +0000 (23:27 +0800)]

Fixed Bug #69297 (function_exists strange behavior with OPCache on disabled function)

is_callable returns true for disable_functions, but function_exists
return false for it.

commit | commitdiff | tree

Anatol Belski [Wed, 25 Mar 2015 12:14:42 +0000 (13:14 +0100)]

commit | commitdiff | tree

Anatol Belski [Wed, 25 Mar 2015 12:13:42 +0000 (13:13 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
fix dir separator in test

commit | commitdiff | tree

Anatol Belski [Wed, 25 Mar 2015 12:13:03 +0000 (13:13 +0100)]