]> granicus.if.org Git - php/log
php
9 years agoAdd extra VM operand specialization
Bob Weinand [Tue, 2 Feb 2016 02:03:21 +0000 (03:03 +0100)]
Add extra VM operand specialization

For now RETVAL and OP_DATA= are supported

9 years agoRemove use of register keyword in headers
Nikita Popov [Thu, 4 Feb 2016 12:31:21 +0000 (13:31 +0100)]
Remove use of register keyword in headers

Headers must be C++ compatible -- this throws warnings.

The register keyword is not used for optimization, at least not
in optimized builds.

9 years agoAdd back typedefs for php_uint32 and php_int32
Nikita Popov [Thu, 4 Feb 2016 11:03:07 +0000 (12:03 +0100)]
Add back typedefs for php_uint32 and php_int32

It's pretty likely that extensions rely on these, no need to break
things.

9 years agoReplace usage of php_hash_uint32 and php_hash_uint64 with uint32_t and uint64_t.
Rouven Weßling [Fri, 29 Jan 2016 12:47:47 +0000 (13:47 +0100)]
Replace usage of php_hash_uint32 and php_hash_uint64 with uint32_t and uint64_t.

Remove the unused php_hash_int32 and php_hash_int64.

9 years agoReplace usage of php_uint16 with uint16_t
Rouven Weßling [Fri, 29 Jan 2016 10:02:46 +0000 (11:02 +0100)]
Replace usage of php_uint16 with uint16_t

9 years agoReplace usage of php_int32 and php_uint32 with int32_t and uint32_t
Rouven Weßling [Thu, 28 Jan 2016 16:11:53 +0000 (17:11 +0100)]
Replace usage of php_int32 and php_uint32 with int32_t and uint32_t

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Thu, 4 Feb 2016 10:45:34 +0000 (11:45 +0100)]
Merge branch 'PHP-7.0'

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

9 years agoMerge branch 'PHP-7.0'
Jakub Zelenka [Wed, 3 Feb 2016 16:23:37 +0000 (16:23 +0000)]
Merge branch 'PHP-7.0'

9 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

9 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

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

sorry about that =\

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

sorry about that =\

9 years agofix generating config.nice; again
Michael Wallner [Thu, 8 Oct 2015 09:16:22 +0000 (11:16 +0200)]
fix generating config.nice; again

The fix in a8bc18420702e1b4fa524d21eae804cd6004879e broke if an arg
containing spaces was passed to configure.

9 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

9 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

9 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

9 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

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

* PHP-7.0:
  update NEWS

9 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

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

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

* PHP-7.0:
  Updated NEWS
  Fix #70720

9 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

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

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

9 years agoMove pi placement into separate function
Nikita Popov [Tue, 2 Feb 2016 16:09:26 +0000 (17:09 +0100)]
Move pi placement into separate function

Non-functional change, just moving code. This makes it easier to
change the order of operations.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 2 Feb 2016 13:28:04 +0000 (14:28 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  reapply the sysconf error check patch
  add error check to sysconf call
  Going for 5.5.33 now

9 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

9 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

9 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

9 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

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

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

9 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)

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

9 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)

9 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

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 2 Feb 2016 08:57:16 +0000 (09:57 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix dir separator

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

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 2 Feb 2016 08:52:26 +0000 (09:52 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix directory separator in test

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

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 2 Feb 2016 08:04:02 +0000 (09:04 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update libs version
  update libs version

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

9 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

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

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 2 Feb 2016 07:33:14 +0000 (08:33 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS

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

9 years agoMerge branch 'PHP-7.0'
Stanislav Malyshev [Tue, 2 Feb 2016 04:46:06 +0000 (20:46 -0800)]
Merge branch 'PHP-7.0'

* PHP-7.0: (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
  ...

9 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

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

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

9 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

9 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

9 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)

9 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

9 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

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

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

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

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

9 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

9 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)

9 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.

9 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

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 1 Feb 2016 14:43:49 +0000 (15:43 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix extensions path for nmake install
  fix extensions path for nmake install
  use correct pointer in the math

9 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

9 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

9 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

9 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

9 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

9 years agoRename IS_ERROR into _IS_ERROR (to prevent redefinition on Windows).
Dmitry Stogov [Mon, 1 Feb 2016 08:12:28 +0000 (11:12 +0300)]
Rename IS_ERROR into _IS_ERROR (to prevent redefinition on Windows).

9 years agoMerge branch 'PHP-7.0'
Stanislav Malyshev [Mon, 1 Feb 2016 05:40:09 +0000 (21:40 -0800)]
Merge branch 'PHP-7.0'

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

9 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

9 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)

9 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

9 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

9 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

9 years agoMerge branch 'PHP-7.0'
Jakub Zelenka [Sun, 31 Jan 2016 18:14:37 +0000 (18:14 +0000)]
Merge branch 'PHP-7.0'

9 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

9 years agoMerge branch 'PHP-7.0'
Jakub Zelenka [Sun, 31 Jan 2016 14:41:08 +0000 (14:41 +0000)]
Merge branch 'PHP-7.0'

9 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

9 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

9 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

9 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

9 years agoRemove version checks
Nikita Popov [Sat, 30 Jan 2016 13:56:17 +0000 (14:56 +0100)]
Remove version checks

PHP_VERSION_ID
PHP_API_VERSION
ZEND_MODULE_API_NO
PHP_MAJOR_VERSION, PHP_MINOR_VERSION
ZEND_ENGINE_2

I've left litespeed alone, as it seems to genuinely maintain support
for many PHP versions.

9 years agoRemove HAVE_SPL checks
Nikita Popov [Sat, 30 Jan 2016 13:39:55 +0000 (14:39 +0100)]
Remove HAVE_SPL checks

SPL is always built.

Also clean up spl_ce_RuntimeException handling in PDO.

9 years agoUse handle as hash in SplObjectStorage
Nikita Popov [Sat, 30 Jan 2016 12:43:56 +0000 (13:43 +0100)]
Use handle as hash in SplObjectStorage

For the default implementation, use a more efficient integer-based
hash. The getHash() interface still requires a string.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Sat, 30 Jan 2016 06:05:59 +0000 (22:05 -0800)]
Merge branch 'PHP-7.0'

9 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).

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Sat, 30 Jan 2016 04:38:59 +0000 (20:38 -0800)]
Merge branch 'PHP-7.0'

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

9 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

9 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

9 years agoMerge branch 'fastcgi-race-fix' of https://github.com/Xenopathic/php-src
Xinchen Hui [Sat, 30 Jan 2016 04:30:52 +0000 (20:30 -0800)]
Merge branch 'fastcgi-race-fix' of https://github.com/Xenopathic/php-src

9 years agorevert test to the previous master state
Anatol Belski [Fri, 29 Jan 2016 21:36:23 +0000 (22:36 +0100)]
revert test to the previous master state

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Fri, 29 Jan 2016 20:46:15 +0000 (21:46 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  yet one revert
  Revert "adjust test for 7.0"

Conflicts:
ext/session/tests/bug69111.phpt

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

9 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.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Fri, 29 Jan 2016 20:07:19 +0000 (21:07 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Revert "refix #69111 and one related test"
  Revert "fix yet another leak"
  add XFAIL
  Revert "refix #69111 and one related test"
  Revert "fix tests"
  Revert "fix leak in 7.0"
  add XFAIL
  Revert "fix leak in 5.6"

Conflicts:
ext/session/tests/rfc1867_sid_invalid.phpt

9 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