]> granicus.if.org Git - php/log
php
8 years agoFix dangling send target when using yield from
Nikita Popov [Thu, 11 Feb 2016 15:22:42 +0000 (16:22 +0100)]
Fix dangling send target when using yield from

Also drop some unnecessary TRY_DELREFs -- leftovers from the days
when null was refcounted.

8 years agofix version header
Anatol Belski [Thu, 11 Feb 2016 15:23:19 +0000 (16:23 +0100)]
fix version header

8 years agoFixed inherited functions from unspecified files being included in phpdbg_get_executa...
Bob Weinand [Thu, 11 Feb 2016 05:42:51 +0000 (06:42 +0100)]
Fixed inherited functions from unspecified files being included in phpdbg_get_executable()

See also https://github.com/krakjoe/phpdbg/issues/152

8 years agoCrude generator GC for value/key/retval
Nikita Popov [Wed, 10 Feb 2016 18:03:02 +0000 (19:03 +0100)]
Crude generator GC for value/key/retval

These values remain live after the generator has been closed, so
they are particularly susceptible to leaking cycles.

8 years agoMerge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Joe Watkins [Wed, 10 Feb 2016 12:58:19 +0000 (12:58 +0000)]
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0

8 years agobe more precise about the meaning of -n
Joe Watkins [Wed, 10 Feb 2016 12:57:48 +0000 (12:57 +0000)]
be more precise about the meaning of -n

8 years agoUpdate NEWS
Xinchen Hui [Tue, 9 Feb 2016 15:36:15 +0000 (23:36 +0800)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Tue, 9 Feb 2016 15:35:55 +0000 (23:35 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/zip/php_zip.c

8 years agoMerge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
Xinchen Hui [Tue, 9 Feb 2016 15:33:30 +0000 (23:33 +0800)]
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6

8 years agoFixed bug #71561 (NULL pointer dereference in Zip::ExtractTo)
Xinchen Hui [Tue, 9 Feb 2016 15:32:20 +0000 (23:32 +0800)]
Fixed bug #71561 (NULL pointer dereference in Zip::ExtractTo)

8 years agoFixed bug (Low probability segfault in zend_arena)
Xinchen Hui [Tue, 9 Feb 2016 04:20:11 +0000 (12:20 +0800)]
Fixed bug (Low probability segfault in zend_arena)

8 years agoAdd entry for re-fix of #70976 in commit 14e4d393
Lior Kaplan [Mon, 8 Feb 2016 18:31:08 +0000 (20:31 +0200)]
Add entry for re-fix of #70976 in commit 14e4d393

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Lior Kaplan [Mon, 8 Feb 2016 18:29:24 +0000 (20:29 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393

8 years agoAlign spacing in make install messages
Lior Kaplan [Mon, 8 Feb 2016 18:27:19 +0000 (20:27 +0200)]
Align spacing in make install messages

8 years agoFixed memory leak in curl_getinfo()
Leigh [Mon, 8 Feb 2016 11:36:14 +0000 (11:36 +0000)]
Fixed memory leak in curl_getinfo()

The "v ? v" in the CAASTR macro caused zend_string_copy to be
called twice

8 years agoHappy Year of Monkey (Forgot test of #71537)
Xinchen Hui [Mon, 8 Feb 2016 02:22:16 +0000 (10:22 +0800)]
Happy Year of Monkey (Forgot test of #71537)

8 years agoAdd entry for re-fix of #70976 in commit 14e4d393
Lior Kaplan [Sun, 7 Feb 2016 18:19:31 +0000 (20:19 +0200)]
Add entry for re-fix of #70976 in commit 14e4d393

8 years agoFixed bug #71537 (PCRE segfault from Opcache)
Xinchen Hui [Sun, 7 Feb 2016 15:19:24 +0000 (23:19 +0800)]
Fixed bug #71537 (PCRE segfault from Opcache)

8 years agoFix bug #71529
Nikita Popov [Sat, 6 Feb 2016 15:38:59 +0000 (16:38 +0100)]
Fix bug #71529

8 years agoOnline test
Xinchen Hui [Fri, 5 Feb 2016 11:56:23 +0000 (19:56 +0800)]
Online test

8 years agoUpdate NEWS
Xinchen Hui [Fri, 5 Feb 2016 11:51:58 +0000 (19:51 +0800)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Fri, 5 Feb 2016 11:51:33 +0000 (19:51 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/curl/interface.c

8 years agoFixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while...
Xinchen Hui [Fri, 5 Feb 2016 11:49:26 +0000 (19:49 +0800)]
Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec)

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Lior Kaplan [Thu, 4 Feb 2016 23:08:22 +0000 (01:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Align NEWS entry format

8 years agoAlign NEWS entry format
Lior Kaplan [Thu, 4 Feb 2016 23:08:01 +0000 (01:08 +0200)]
Align NEWS entry format

8 years agoAlign NEWS entry format
Lior Kaplan [Thu, 4 Feb 2016 22:40:12 +0000 (00:40 +0200)]
Align NEWS entry format

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 4 Feb 2016 19:41:13 +0000 (20:41 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS

8 years agoupdate NEWS
Ferenc Kovacs [Thu, 4 Feb 2016 19:40:54 +0000 (20:40 +0100)]
update NEWS

8 years agoadd missin NEWS entry
Anatol Belski [Thu, 4 Feb 2016 17:09:35 +0000 (18:09 +0100)]
add missin NEWS entry

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Thu, 4 Feb 2016 16:54:44 +0000 (16:54 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoSplit and clean up OpenSSL X509 tests
Jakub Zelenka [Thu, 4 Feb 2016 16:51:36 +0000 (16:51 +0000)]
Split and clean up OpenSSL X509 tests

8 years agoFix bug #71501
Hieu Le [Wed, 3 Feb 2016 06:20:30 +0000 (13:20 +0700)]
Fix bug #71501

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Wed, 3 Feb 2016 16:22:39 +0000 (16:22 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoRename and clean up OpenSSL tests
Jakub Zelenka [Wed, 3 Feb 2016 16:20:27 +0000 (16:20 +0000)]
Rename and clean up OpenSSL tests

8 years agofix build
Antony Dovgal [Wed, 3 Feb 2016 15:02:58 +0000 (18:02 +0300)]
fix build

sorry about that =\

8 years agouse correct element size, avoid reading stack
Antony Dovgal [Wed, 3 Feb 2016 12:11:59 +0000 (15:11 +0300)]
use correct element size, avoid reading stack

8 years agocheck length first, prevent out-of-bounds read
Antony Dovgal [Wed, 3 Feb 2016 11:48:38 +0000 (14:48 +0300)]
check length first, prevent out-of-bounds read

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 3 Feb 2016 00:08:09 +0000 (01:08 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS

8 years agoupdate NEWS
Ferenc Kovacs [Wed, 3 Feb 2016 00:07:34 +0000 (01:07 +0100)]
update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Julien Pauli [Tue, 2 Feb 2016 17:17:16 +0000 (18:17 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Updated NEWS
  Fix #70720

Conflicts:
ext/standard/string.c
ext/standard/tests/strings/bug70720.phpt

8 years agoUpdated NEWS
Julien Pauli [Tue, 2 Feb 2016 17:14:57 +0000 (18:14 +0100)]
Updated NEWS

8 years agoFix #70720
Julien Pauli [Tue, 22 Dec 2015 15:25:51 +0000 (16:25 +0100)]
Fix #70720

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 2 Feb 2016 13:27:30 +0000 (14:27 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  add error check to sysconf call
  Going for 5.5.33 now

8 years agoreapply the sysconf error check patch
Anatol Belski [Tue, 2 Feb 2016 13:26:58 +0000 (14:26 +0100)]
reapply the sysconf error check patch

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 2 Feb 2016 13:22:31 +0000 (14:22 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add error check to sysconf call
  Going for 5.5.33 now

Conflicts:
configure.in
main/php_version.h

8 years agoadd error check to sysconf call
Anatol Belski [Tue, 2 Feb 2016 13:19:10 +0000 (14:19 +0100)]
add error check to sysconf call

8 years agoUpdated to version 2016.1 (2016a)
Derick Rethans [Tue, 2 Feb 2016 10:34:05 +0000 (10:34 +0000)]
Updated to version 2016.1 (2016a)

8 years agoEmpty merge
Derick Rethans [Tue, 2 Feb 2016 10:34:05 +0000 (10:34 +0000)]
Empty merge

8 years agoUpdated to version 2016.1 (2016a)
Derick Rethans [Tue, 2 Feb 2016 10:34:03 +0000 (10:34 +0000)]
Updated to version 2016.1 (2016a)

8 years agoGoing for 5.5.33 now
Julien Pauli [Tue, 2 Feb 2016 09:42:49 +0000 (10:42 +0100)]
Going for 5.5.33 now

8 years agofix dir separator
Anatol Belski [Tue, 2 Feb 2016 08:56:57 +0000 (09:56 +0100)]
fix dir separator

8 years agofix directory separator in test
Anatol Belski [Tue, 2 Feb 2016 08:52:07 +0000 (09:52 +0100)]
fix directory separator in test

8 years agoupdate libs version
Anatol Belski [Tue, 2 Feb 2016 08:03:40 +0000 (09:03 +0100)]
update libs version

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 2 Feb 2016 08:03:22 +0000 (09:03 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update libs version

8 years agoupdate libs version
Anatol Belski [Tue, 2 Feb 2016 08:02:12 +0000 (09:02 +0100)]
update libs version

8 years agoupdate NEWS
Anatol Belski [Tue, 2 Feb 2016 07:32:28 +0000 (08:32 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.0.3' into PHP-7.0
Stanislav Malyshev [Tue, 2 Feb 2016 04:45:49 +0000 (20:45 -0800)]
Merge branch 'PHP-7.0.3' into PHP-7.0

* PHP-7.0.3: (35 commits)
  fix tests
  update NEWS
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71475: openssl_seal() uninitialized memory usage
  Fixed bug #71488: Stack overflow when decompressing tar archives
  fix tests
  fix wrong gc sequence
  revert the API string as well
  update NEWS
  Revert "Fix #70720"
  sync NEWS
  reset ext/session to the state of 7.0.2
  update NEWS
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  ...

Conflicts:
configure.in
ext/session/tests/bug69111.phpt
main/php_version.h

8 years agofix tests
Stanislav Malyshev [Tue, 2 Feb 2016 04:23:21 +0000 (20:23 -0800)]
fix tests

8 years agoupdate NEWS
Stanislav Malyshev [Tue, 2 Feb 2016 04:23:06 +0000 (20:23 -0800)]
update NEWS

8 years agoMerge branch 'PHP-5.6.18' into PHP-7.0.3
Stanislav Malyshev [Tue, 2 Feb 2016 03:55:09 +0000 (19:55 -0800)]
Merge branch 'PHP-5.6.18' into PHP-7.0.3

* PHP-5.6.18:
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71488: Stack overflow when decompressing tar archives
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  Fix bug #71459 - Integer overflow in iptcembed()
  prepare 5.6.18RC1
  Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
  improve fix for bug #71201
  Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
  Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata()
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
  Fix bug #71335: Type Confusion in WDDX Packet Deserialization
  Fix bug #71354 - remove UMR when size is 0

Conflicts:
configure.in
ext/phar/dirstream.c
ext/phar/phar_object.c
ext/phar/tar.c
ext/standard/exec.c
ext/standard/iptc.c
ext/standard/math.c
ext/standard/streamsfuncs.c
ext/wddx/wddx.c
main/php_version.h
main/streams/memory.c

8 years agoMerge commit 'ca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62' into PHP-7.0.3
Stanislav Malyshev [Tue, 2 Feb 2016 03:35:59 +0000 (19:35 -0800)]
Merge commit 'ca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62' into PHP-7.0.3

* commit 'ca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62':
  Upgrade bundled PCRE to 8.38
  Fixed NEWS file entry
  fix the fix for bug #70976 (imagerotate)

Conflicts:
ext/pcre/pcrelib/config.h

8 years agoMerge remote-tracking branch 'origin/PHP-7.0.3' into PHP-7.0.3
Stanislav Malyshev [Tue, 2 Feb 2016 03:32:06 +0000 (19:32 -0800)]
Merge remote-tracking branch 'origin/PHP-7.0.3' into PHP-7.0.3

* origin/PHP-7.0.3:
  fix tests
  fix wrong gc sequence
  revert the API string as well
  update NEWS
  Revert "Fix #70720"
  sync NEWS
  reset ext/session to the state of 7.0.2
  improve fix for bug #71201
  set versions to 7.0.3RC1
  fix test for 7.0, OpenSSL >= 1.0.2 disables SSLv2 by default
  fork test
  fix test
  fork test
  fork test for win32
  fork test
  Use SUCCESS/FAILURE
  Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
  Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
  Update NEWS
  Fixed bug 71397 (mb_send_mail segmentation fault)

8 years agoMerge branch 'PHP-5.6.18' into PHP-5.6
Stanislav Malyshev [Tue, 2 Feb 2016 03:16:34 +0000 (19:16 -0800)]
Merge branch 'PHP-5.6.18' into PHP-5.6

* PHP-5.6.18:
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71488: Stack overflow when decompressing tar archives
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  Fix bug #71459 - Integer overflow in iptcembed()
  prepare 5.6.18RC1
  Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
  Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata()
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
  Fix bug #71335: Type Confusion in WDDX Packet Deserialization
  Fix bug #71354 - remove UMR when size is 0

Conflicts:
configure.in
main/php_version.h

8 years agoMerge branch 'PHP-5.5' into PHP-5.6.18
Stanislav Malyshev [Tue, 2 Feb 2016 03:15:19 +0000 (19:15 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6.18

* PHP-5.5:
  fix tests
  fix NEWS
  update NEWS

8 years agofix tests
Stanislav Malyshev [Tue, 2 Feb 2016 02:58:02 +0000 (18:58 -0800)]
fix tests

8 years agofix NEWS
Stanislav Malyshev [Tue, 2 Feb 2016 02:47:56 +0000 (18:47 -0800)]
fix NEWS

8 years agoUpdate NEWS
Stanislav Malyshev [Tue, 2 Feb 2016 02:47:28 +0000 (18:47 -0800)]
Update NEWS

8 years agoupdate NEWS
Stanislav Malyshev [Tue, 2 Feb 2016 02:44:33 +0000 (18:44 -0800)]
update NEWS

8 years agoMerge branch 'PHP-5.5.32' into PHP-5.6.18
Stanislav Malyshev [Tue, 2 Feb 2016 02:32:31 +0000 (18:32 -0800)]
Merge branch 'PHP-5.5.32' into PHP-5.6.18

* PHP-5.5.32:
  Fixed bug #71488: Stack overflow when decompressing tar archives
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  Fix bug #71459 - Integer overflow in iptcembed()
  Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
  Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata()
  Fix bug #71335: Type Confusion in WDDX Packet Deserialization
  Fix bug #71354 - remove UMR when size is 0

8 years agoMerge branch 'PHP-5.5' into PHP-5.6.18
Stanislav Malyshev [Tue, 2 Feb 2016 02:32:14 +0000 (18:32 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6.18

* PHP-5.5:
  Upgrade bundled PCRE to 8.38
  Fixed NEWS file entry
  fix the fix for bug #70976 (imagerotate)

8 years agoMerge remote-tracking branch 'origin/PHP-5.6.18' into PHP-5.6.18
Stanislav Malyshev [Tue, 2 Feb 2016 02:31:57 +0000 (18:31 -0800)]
Merge remote-tracking branch 'origin/PHP-5.6.18' into PHP-5.6.18

* origin/PHP-5.6.18:
  prepare 5.6.18RC1
  Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
  improve fix for bug #71201
  fork test
  fix test
  fork test
  fork test for win32
  fork test
  Use SUCCESS/FAILURE
  Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
  Fix header file include
  Fixed bug #69111 (Crash in SessionHandler::read()). Made session save handler abuse much harder than before.

8 years agoMerge branch 'PHP-5.5' into PHP-5.5.32
Stanislav Malyshev [Tue, 2 Feb 2016 02:28:49 +0000 (18:28 -0800)]
Merge branch 'PHP-5.5' into PHP-5.5.32

* PHP-5.5:
  Upgrade bundled PCRE to 8.38
  Fixed NEWS file entry

8 years agofix extensions path for nmake install
Anatol Belski [Mon, 1 Feb 2016 14:42:32 +0000 (15:42 +0100)]
fix extensions path for nmake install

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 1 Feb 2016 14:41:04 +0000 (15:41 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix extensions path for nmake install

8 years agofix extensions path for nmake install
Anatol Belski [Mon, 1 Feb 2016 14:38:53 +0000 (15:38 +0100)]
fix extensions path for nmake install

8 years agouse correct pointer in the math
Antony Dovgal [Mon, 1 Feb 2016 13:32:06 +0000 (16:32 +0300)]
use correct pointer in the math

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 1 Feb 2016 05:29:46 +0000 (21:29 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Upgrade bundled PCRE to 8.38
  Fixed NEWS file entry
  fix the fix for bug #70976 (imagerotate)

Conflicts:
ext/pcre/pcrelib/config.h

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 1 Feb 2016 05:05:46 +0000 (21:05 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Upgrade bundled PCRE to 8.38
  Fixed NEWS file entry
  fix the fix for bug #70976 (imagerotate)

8 years agoUpgrade bundled PCRE to 8.38
Stanislav Malyshev [Mon, 1 Feb 2016 04:33:17 +0000 (20:33 -0800)]
Upgrade bundled PCRE to 8.38

8 years agoFixed bug #71475: openssl_seal() uninitialized memory usage
Stanislav Malyshev [Mon, 1 Feb 2016 04:18:46 +0000 (20:18 -0800)]
Fixed bug #71475: openssl_seal() uninitialized memory usage

8 years agoFixed bug #71488: Stack overflow when decompressing tar archives
Stanislav Malyshev [Mon, 1 Feb 2016 03:37:56 +0000 (19:37 -0800)]
Fixed bug #71488: Stack overflow when decompressing tar archives

8 years agoRename private.key to private_rsa_1024.key in new openssl_seal test
Jakub Zelenka [Sun, 31 Jan 2016 18:13:37 +0000 (18:13 +0000)]
Rename private.key to private_rsa_1024.key in new openssl_seal test

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Sun, 31 Jan 2016 14:40:20 +0000 (14:40 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoRewrite OpenSSL SPKI tests to speed them up
Jakub Zelenka [Sun, 31 Jan 2016 14:28:13 +0000 (14:28 +0000)]
Rewrite OpenSSL SPKI tests to speed them up

Also fix some CS issue and naming

8 years agoAdd private RSA keys with 2048 and 4096 bit long modulus
Jakub Zelenka [Sun, 31 Jan 2016 13:57:00 +0000 (13:57 +0000)]
Add private RSA keys with 2048 and 4096 bit long modulus

8 years agoRename private.key to private_rsa_1024.key
Jakub Zelenka [Sun, 31 Jan 2016 13:54:16 +0000 (13:54 +0000)]
Rename private.key to private_rsa_1024.key

8 years agoFixed bug #71485 (Return typehint on interanal func causes Fatal error when it throws...
Xinchen Hui [Sat, 30 Jan 2016 06:05:52 +0000 (22:05 -0800)]
Fixed bug #71485 (Return typehint on interanal func causes Fatal error when it throws exception).

8 years agoAlso WIN32 side
Xinchen Hui [Sat, 30 Jan 2016 04:38:50 +0000 (20:38 -0800)]
Also WIN32 side

8 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Sat, 30 Jan 2016 04:37:14 +0000 (20:37 -0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

8 years agoProperly read any remaining data when closing FastCGI socket
Robin McCorkell [Fri, 29 Jan 2016 15:14:08 +0000 (15:14 +0000)]
Properly read any remaining data when closing FastCGI socket

8 years agoyet one revert
Anatol Belski [Fri, 29 Jan 2016 20:43:14 +0000 (21:43 +0100)]
yet one revert

8 years agoRevert "adjust test for 7.0"
Anatol Belski [Fri, 29 Jan 2016 20:27:22 +0000 (21:27 +0100)]
Revert "adjust test for 7.0"

This reverts commit 7fdb019e66ae8faf1a83b57dc7f2dc7b72296fdc.

8 years agoRevert "refix #69111 and one related test"
Anatol Belski [Fri, 29 Jan 2016 19:59:58 +0000 (20:59 +0100)]
Revert "refix #69111 and one related test"

This reverts commit 80f7b0125875116fdbcdaf48cf8b1bbf93cb378c.

Conflicts:
ext/session/mod_files.c

8 years agoRevert "fix yet another leak"
Anatol Belski [Fri, 29 Jan 2016 19:58:00 +0000 (20:58 +0100)]
Revert "fix yet another leak"

This reverts commit 39084ccc689397a11de4d231fe8629549d66ce73.

8 years agoadd XFAIL
Anatol Belski [Fri, 29 Jan 2016 19:57:05 +0000 (20:57 +0100)]
add XFAIL

8 years agoRevert "refix #69111 and one related test"
Anatol Belski [Fri, 29 Jan 2016 19:50:14 +0000 (20:50 +0100)]
Revert "refix #69111 and one related test"

This reverts commit 80f7b0125875116fdbcdaf48cf8b1bbf93cb378c.

8 years agoRevert "fix tests"
Anatol Belski [Fri, 29 Jan 2016 19:49:52 +0000 (20:49 +0100)]
Revert "fix tests"

This reverts commit d964ccba4008ca090c1c5b443aff196fc3ef947d.

8 years agoRevert "fix leak in 7.0"
Anatol Belski [Fri, 29 Jan 2016 19:46:47 +0000 (20:46 +0100)]
Revert "fix leak in 7.0"

This reverts commit ee49df011ce55f088908c54ef24ce4db45574414.

8 years agoremove NEWS entry
Anatol Belski [Fri, 29 Jan 2016 19:40:27 +0000 (20:40 +0100)]
remove NEWS entry

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 29 Jan 2016 19:37:46 +0000 (20:37 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  add XFAIL
  Revert "fix leak in 5.6"