granicus.if.org Git

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Rouven Weßling [Fri, 29 Jan 2016 10:02:46 +0000 (11:02 +0100)]

Replace usage of php_uint16 with uint16_t

commit | commitdiff | tree

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

commit | commitdiff | tree

Nikita Popov [Thu, 4 Feb 2016 10:45:34 +0000 (11:45 +0100)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Hieu Le [Wed, 3 Feb 2016 06:20:30 +0000 (13:20 +0700)]

Fix bug #71501

commit | commitdiff | tree

Jakub Zelenka [Wed, 3 Feb 2016 16:23:37 +0000 (16:23 +0000)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Jakub Zelenka [Wed, 3 Feb 2016 16:22:39 +0000 (16:22 +0000)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Jakub Zelenka [Wed, 3 Feb 2016 16:20:27 +0000 (16:20 +0000)]

Rename and clean up OpenSSL tests

commit | commitdiff | tree

Antony Dovgal [Wed, 3 Feb 2016 15:02:58 +0000 (18:02 +0300)]

fix build

sorry about that =\

commit | commitdiff | tree

Antony Dovgal [Wed, 3 Feb 2016 15:02:58 +0000 (18:02 +0300)]

fix build

sorry about that =\

commit | commitdiff | tree

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.

commit | commitdiff | tree

Antony Dovgal [Wed, 3 Feb 2016 12:11:59 +0000 (15:11 +0300)]

use correct element size, avoid reading stack

commit | commitdiff | tree

Antony Dovgal [Wed, 3 Feb 2016 12:11:59 +0000 (15:11 +0300)]

use correct element size, avoid reading stack

commit | commitdiff | tree

Antony Dovgal [Wed, 3 Feb 2016 11:48:38 +0000 (14:48 +0300)]

check length first, prevent out-of-bounds read

commit | commitdiff | tree

Antony Dovgal [Wed, 3 Feb 2016 11:48:38 +0000 (14:48 +0300)]

check length first, prevent out-of-bounds read

commit | commitdiff | tree

Ferenc Kovacs [Wed, 3 Feb 2016 00:08:28 +0000 (01:08 +0100)]

Merge branch 'PHP-7.0'

* PHP-7.0:
update NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

Ferenc Kovacs [Wed, 3 Feb 2016 00:07:34 +0000 (01:07 +0100)]

update NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Julien Pauli [Tue, 2 Feb 2016 17:14:57 +0000 (18:14 +0100)]

Updated NEWS

commit | commitdiff | tree

Julien Pauli [Tue, 22 Dec 2015 15:25:51 +0000 (16:25 +0100)]

Fix #70720

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 2 Feb 2016 13:26:58 +0000 (14:26 +0100)]

reapply the sysconf error check patch

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 2 Feb 2016 13:19:10 +0000 (14:19 +0100)]

add error check to sysconf call

commit | commitdiff | tree

Derick Rethans [Tue, 2 Feb 2016 10:34:07 +0000 (10:34 +0000)]

Updated to version 2016.1 (2016a)

commit | commitdiff | tree

Derick Rethans [Tue, 2 Feb 2016 10:34:06 +0000 (10:34 +0000)]

Empty merge

commit | commitdiff | tree

Derick Rethans [Tue, 2 Feb 2016 10:34:05 +0000 (10:34 +0000)]

Updated to version 2016.1 (2016a)

commit | commitdiff | tree

Derick Rethans [Tue, 2 Feb 2016 10:34:05 +0000 (10:34 +0000)]

Empty merge

commit | commitdiff | tree

Derick Rethans [Tue, 2 Feb 2016 10:34:03 +0000 (10:34 +0000)]

Updated to version 2016.1 (2016a)

commit | commitdiff | tree

Julien Pauli [Tue, 2 Feb 2016 09:42:49 +0000 (10:42 +0100)]

Going for 5.5.33 now

commit | commitdiff | tree

Anatol Belski [Tue, 2 Feb 2016 08:57:16 +0000 (09:57 +0100)]

Merge branch 'PHP-7.0'

* PHP-7.0:
fix dir separator

commit | commitdiff | tree

Anatol Belski [Tue, 2 Feb 2016 08:56:57 +0000 (09:56 +0100)]

fix dir separator

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 2 Feb 2016 08:52:07 +0000 (09:52 +0100)]

fix directory separator in test

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 2 Feb 2016 08:03:40 +0000 (09:03 +0100)]

update libs version

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 2 Feb 2016 08:02:12 +0000 (09:02 +0100)]

update libs version

commit | commitdiff | tree

Anatol Belski [Tue, 2 Feb 2016 07:33:14 +0000 (08:33 +0100)]

Merge branch 'PHP-7.0'

* PHP-7.0:
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 2 Feb 2016 07:32:28 +0000 (08:32 +0100)]

update NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

fix tests

commit | commitdiff | tree

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

update NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stanislav Malyshev [Tue, 2 Feb 2016 02:58:02 +0000 (18:58 -0800)]

fix tests

commit | commitdiff | tree

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

fix NEWS

commit | commitdiff | tree

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

Update NEWS

commit | commitdiff | tree

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

update NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 1 Feb 2016 14:42:32 +0000 (15:42 +0100)]

fix extensions path for nmake install

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 1 Feb 2016 14:38:53 +0000 (15:38 +0100)]

fix extensions path for nmake install

commit | commitdiff | tree

Antony Dovgal [Mon, 1 Feb 2016 13:32:06 +0000 (16:32 +0300)]

use correct pointer in the math

commit | commitdiff | tree

Antony Dovgal [Mon, 1 Feb 2016 13:32:06 +0000 (16:32 +0300)]

use correct pointer in the math

commit | commitdiff | tree

Dmitry Stogov [Mon, 1 Feb 2016 08:12:28 +0000 (11:12 +0300)]

Rename IS_ERROR into _IS_ERROR (to prevent redefinition on Windows).

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 1 Feb 2016 04:33:17 +0000 (20:33 -0800)]

Upgrade bundled PCRE to 8.38

commit | commitdiff | tree

Stanislav Malyshev [Mon, 1 Feb 2016 04:18:46 +0000 (20:18 -0800)]

Fixed bug #71475: openssl_seal() uninitialized memory usage

commit | commitdiff | tree

Stanislav Malyshev [Mon, 1 Feb 2016 03:37:56 +0000 (19:37 -0800)]

Fixed bug #71488: Stack overflow when decompressing tar archives