]> granicus.if.org Git - php/log
php
8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 20 Oct 2016 11:26:34 +0000 (13:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #71241: array_replace_recursive mutates ref params
Adam Saponara [Fri, 26 Aug 2016 21:33:22 +0000 (17:33 -0400)]
Fix bug #71241: array_replace_recursive mutates ref params

`array_replace_recursive` can sometimes mutate its params if
references are nested within. This differs from the PHP 5 behavior.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Leigh [Thu, 20 Oct 2016 09:18:16 +0000 (10:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoAdd php_random_int internal API
Leigh [Wed, 19 Oct 2016 17:00:54 +0000 (18:00 +0100)]
Add php_random_int internal API

This is the internal API compliment to `php_random_bytes`

8 years agonews entry for #pr 2152
Joe Watkins [Thu, 20 Oct 2016 04:21:56 +0000 (05:21 +0100)]
news entry for #pr 2152

8 years agoMerge branch 'pull-request/2152' into PHP-7.1
Joe Watkins [Thu, 20 Oct 2016 04:23:21 +0000 (05:23 +0100)]
Merge branch 'pull-request/2152' into PHP-7.1

8 years agonews entry for #pr 2152
Joe Watkins [Thu, 20 Oct 2016 04:21:56 +0000 (05:21 +0100)]
news entry for #pr 2152

8 years agoMerge branch 'pull-request/2152' into PHP-7.0
Joe Watkins [Thu, 20 Oct 2016 04:19:10 +0000 (05:19 +0100)]
Merge branch 'pull-request/2152' into PHP-7.0

8 years agoFixed typo
Dmitry Stogov [Wed, 19 Oct 2016 22:17:40 +0000 (01:17 +0300)]
Fixed typo

8 years agoIntroduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)
Dmitry Stogov [Wed, 19 Oct 2016 20:10:42 +0000 (23:10 +0300)]
Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)

8 years agoupdate NEWS
Anatol Belski [Tue, 18 Oct 2016 17:44:20 +0000 (19:44 +0200)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 18 Oct 2016 17:43:57 +0000 (19:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Tue, 18 Oct 2016 17:43:12 +0000 (19:43 +0200)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 18 Oct 2016 17:14:14 +0000 (19:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73329 (Float)"Nano" == NAN

8 years agoFixed bug #73329 (Float)"Nano" == NAN
Anatol Belski [Tue, 18 Oct 2016 17:11:18 +0000 (19:11 +0200)]
Fixed bug #73329 (Float)"Nano" == NAN

The special cases (float)"inf", etc. were never intended and are
caused by the updated strtod lib. While it might be nice as an
easy way to produce Inf and NaN special values, it was never
documented and cause BC breaches.

8 years agosync NEWS
Anatol Belski [Tue, 18 Oct 2016 16:24:42 +0000 (18:24 +0200)]
sync NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 18 Oct 2016 16:22:52 +0000 (18:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  sync NEWS

8 years agosync NEWS
Anatol Belski [Tue, 18 Oct 2016 16:18:04 +0000 (18:18 +0200)]
sync NEWS

48f1a178 is reverted

8 years agoMerge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
Bob Weinand [Tue, 18 Oct 2016 12:31:49 +0000 (14:31 +0200)]
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1

8 years agoFixed bug #73338 (Exception thrown from error handler may crash)
Bob Weinand [Tue, 18 Oct 2016 12:13:20 +0000 (14:13 +0200)]
Fixed bug #73338 (Exception thrown from error handler may crash)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Tue, 18 Oct 2016 12:09:44 +0000 (15:09 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
  Revert "Fix bug #47890 #73215 uniqid() should use better random source"
  Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Dmitry Stogov [Tue, 18 Oct 2016 12:04:49 +0000 (15:04 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)

8 years agoFixed bug #73337 (try/catch not working with two exceptions inside a same operation)
Dmitry Stogov [Tue, 18 Oct 2016 11:48:01 +0000 (14:48 +0300)]
Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)

8 years agoRevert "Fix bug #47890 #73215 uniqid() should use better random source"
Joe Watkins [Tue, 18 Oct 2016 10:30:33 +0000 (11:30 +0100)]
Revert "Fix bug #47890 #73215 uniqid() should use better random source"

This reverts commit 48f1a17886d874dc90867c669481804de90509e8.

8 years agoRevert "Fix bug #47890 #73215 uniqid() should use better random source"
Joe Watkins [Tue, 18 Oct 2016 10:30:19 +0000 (11:30 +0100)]
Revert "Fix bug #47890 #73215 uniqid() should use better random source"

This reverts commit 48f1a17886d874dc90867c669481804de90509e8.

8 years agoFixed type inference rules.
Dmitry Stogov [Tue, 18 Oct 2016 09:39:33 +0000 (12:39 +0300)]
Fixed type inference rules.

8 years agoUpdate NEWS
Yasuo Ohgaki [Tue, 18 Oct 2016 00:28:18 +0000 (09:28 +0900)]
Update NEWS

8 years agoUpdate NEWS
Yasuo Ohgaki [Tue, 18 Oct 2016 00:28:08 +0000 (09:28 +0900)]
Update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Yasuo Ohgaki [Tue, 18 Oct 2016 00:14:48 +0000 (09:14 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #47890 #73215 uniqid() should use better random source

8 years agoFix bug #47890 #73215 uniqid() should use better random source
Yasuo Ohgaki [Tue, 18 Oct 2016 00:04:57 +0000 (09:04 +0900)]
Fix bug #47890 #73215 uniqid() should use better random source

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Mon, 17 Oct 2016 22:00:37 +0000 (00:00 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoSimply return FALSE from session_gc(). Error could be annoying because internal save...
Yasuo Ohgaki [Mon, 17 Oct 2016 21:52:52 +0000 (06:52 +0900)]
Simply return FALSE from session_gc(). Error could be annoying because internal save handlers may return -1 when GC cannot be performed for reasons

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 17 Oct 2016 21:37:00 +0000 (23:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).

8 years agoFix #73333: 2147483647 is fetched as string
Christoph M. Becker [Mon, 17 Oct 2016 14:58:49 +0000 (16:58 +0200)]
Fix #73333: 2147483647 is fetched as string

We return all integers that can be represented as such by PHP as
integers, and only those that exceed the possible range as strings.
On builds which represent integers with 64 bits, the range check is
unnecessary and might cause code checkers to complain, so we skip this
special casing via the preprocessor according to
<http://git.php.net/?p=php-src.git;a=commit;h=99d087e5>.

8 years agoUse simple "one-pass" algorithm.
Dmitry Stogov [Mon, 17 Oct 2016 21:06:20 +0000 (00:06 +0300)]
Use simple "one-pass" algorithm.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 17 Oct 2016 19:27:32 +0000 (21:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  sync NEWS
  Merge branch 'pull-request/1817'
  Merge branch 'pull-request/1816'
  Merge branch 'pull-request/1814'
  Merge branch 'pull-request/1808'
  Merge branch 'pull-request/2097'
  news entry for pr #2158
  Merge branch 'pull-request/2158'

8 years agosync NEWS
Anatol Belski [Mon, 17 Oct 2016 19:26:34 +0000 (21:26 +0200)]
sync NEWS

8 years agoMerge branch 'pull-request/1817'
Joe Watkins [Mon, 17 Oct 2016 15:49:24 +0000 (16:49 +0100)]
Merge branch 'pull-request/1817'

8 years agoMerge branch 'pull-request/1816'
Joe Watkins [Mon, 17 Oct 2016 15:50:12 +0000 (16:50 +0100)]
Merge branch 'pull-request/1816'

8 years agoMerge branch 'pull-request/1814'
Joe Watkins [Mon, 17 Oct 2016 15:50:53 +0000 (16:50 +0100)]
Merge branch 'pull-request/1814'

8 years agoMerge branch 'pull-request/1808'
Joe Watkins [Mon, 17 Oct 2016 15:53:04 +0000 (16:53 +0100)]
Merge branch 'pull-request/1808'

8 years agoMerge branch 'pull-request/1817'
Joe Watkins [Mon, 17 Oct 2016 15:49:24 +0000 (16:49 +0100)]
Merge branch 'pull-request/1817'

8 years agoMerge branch 'pull-request/1816'
Joe Watkins [Mon, 17 Oct 2016 15:50:12 +0000 (16:50 +0100)]
Merge branch 'pull-request/1816'

8 years agoMerge branch 'pull-request/1814'
Joe Watkins [Mon, 17 Oct 2016 15:50:53 +0000 (16:50 +0100)]
Merge branch 'pull-request/1814'

8 years agoMerge branch 'pull-request/1808'
Joe Watkins [Mon, 17 Oct 2016 15:53:04 +0000 (16:53 +0100)]
Merge branch 'pull-request/1808'

8 years agoMerge branch 'pull-request/2097'
Joe Watkins [Mon, 17 Oct 2016 14:59:51 +0000 (15:59 +0100)]
Merge branch 'pull-request/2097'

8 years agoMerge branch 'pull-request/2097'
Joe Watkins [Mon, 17 Oct 2016 14:59:51 +0000 (15:59 +0100)]
Merge branch 'pull-request/2097'

8 years agonews entry for pr #2158
Joe Watkins [Mon, 17 Oct 2016 14:50:59 +0000 (15:50 +0100)]
news entry for pr #2158

8 years agoMerge branch 'pull-request/2158'
Joe Watkins [Mon, 17 Oct 2016 13:42:35 +0000 (14:42 +0100)]
Merge branch 'pull-request/2158'

8 years agonews entry for pr #2158
Joe Watkins [Mon, 17 Oct 2016 13:47:08 +0000 (14:47 +0100)]
news entry for pr #2158

8 years agoMerge branch 'pull-request/2158'
Joe Watkins [Mon, 17 Oct 2016 13:42:35 +0000 (14:42 +0100)]
Merge branch 'pull-request/2158'

8 years agoRevert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
Joe Watkins [Mon, 17 Oct 2016 13:22:55 +0000 (14:22 +0100)]
Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"

This reverts commit 2d8ab51576695630a7471ff829cc5ea10becdc0f.

8 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Joe Watkins [Mon, 17 Oct 2016 13:12:15 +0000 (14:12 +0100)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

8 years agosync news from 7.1.0RC4
Joe Watkins [Mon, 17 Oct 2016 13:11:39 +0000 (14:11 +0100)]
sync news from 7.1.0RC4

8 years agoalso fix 32bits test for microsecond
Remi Collet [Mon, 17 Oct 2016 13:07:56 +0000 (15:07 +0200)]
also fix 32bits test for microsecond

8 years agobump news version
Joe Watkins [Mon, 17 Oct 2016 10:31:34 +0000 (11:31 +0100)]
bump news version

8 years agoUpdate 7.1 NEWS for bug #71148
Christopher Jones [Mon, 17 Oct 2016 01:52:34 +0000 (12:52 +1100)]
Update 7.1 NEWS for bug #71148

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Mon, 17 Oct 2016 01:40:54 +0000 (12:40 +1100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #71148 (Bind reference overwritten on PHP 7)
Christopher Jones [Mon, 17 Oct 2016 01:40:14 +0000 (12:40 +1100)]
Fixed bug #71148 (Bind reference overwritten on PHP 7)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sun, 16 Oct 2016 13:46:33 +0000 (15:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #71234 (INI files are loaded even invoked as phpdbg -n --version)
Bob Weinand [Sun, 16 Oct 2016 13:41:37 +0000 (15:41 +0200)]
Fixed bug #71234 (INI files are loaded even invoked as phpdbg -n --version)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sun, 16 Oct 2016 11:48:13 +0000 (13:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #70776 (Simple SIGINT does not have any effect)
Bob Weinand [Sun, 16 Oct 2016 11:47:49 +0000 (13:47 +0200)]
Fixed bug #70776 (Simple SIGINT does not have any effect)

8 years agoFix searching for catch blocks
Bob Weinand [Sun, 16 Oct 2016 10:34:10 +0000 (12:34 +0200)]
Fix searching for catch blocks
Since PHP-7.1 catch blocks are addressed with relative byte difference between two catch blocks as opposed to absolute opcode number

8 years agoVarious function info fixes
Nikita Popov [Fri, 14 Oct 2016 22:13:24 +0000 (00:13 +0200)]
Various function info fixes

8 years agoVarious RC inference fixes
Nikita Popov [Fri, 14 Oct 2016 21:54:11 +0000 (23:54 +0200)]
Various RC inference fixes

8 years agoFix SplFixedArray::offsetGet() invocation for NULL offset
Nikita Popov [Sat, 15 Oct 2016 21:21:12 +0000 (23:21 +0200)]
Fix SplFixedArray::offsetGet() invocation for NULL offset

8 years agoNormalize preg_replace_callback() return value
Nikita Popov [Sat, 15 Oct 2016 21:03:03 +0000 (23:03 +0200)]
Normalize preg_replace_callback() return value

One particular error case was returning the argument without
casting to string.

8 years agoUpdate to SQLite 3.15.0
Christoph M. Becker [Sat, 15 Oct 2016 17:36:26 +0000 (19:36 +0200)]
Update to SQLite 3.15.0

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 14 Oct 2016 17:52:52 +0000 (19:52 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  sync NEWS

8 years agosync NEWS
Anatol Belski [Fri, 14 Oct 2016 17:52:04 +0000 (19:52 +0200)]
sync NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Fri, 14 Oct 2016 15:31:26 +0000 (17:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  bump ext/zip version

8 years agobump ext/zip version
Remi Collet [Fri, 14 Oct 2016 15:31:07 +0000 (17:31 +0200)]
bump ext/zip version

8 years agoImplement #72918: negative offset inside a quoted string leads to parse error
Christoph M. Becker [Tue, 27 Sep 2016 18:26:16 +0000 (20:26 +0200)]
Implement #72918: negative offset inside a quoted string leads to parse error

We allow negative numeric offsets for the simple syntax inside
double-quoted and heredoc strings.

8 years agoUpdate NEWS
Christoph M. Becker [Fri, 14 Oct 2016 11:52:21 +0000 (13:52 +0200)]
Update NEWS

This entry has been lost due to a bad merge.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Fri, 14 Oct 2016 10:25:16 +0000 (12:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix memory leak when compiling files in phpdbg
Bob Weinand [Fri, 14 Oct 2016 10:24:28 +0000 (12:24 +0200)]
Fix memory leak when compiling files in phpdbg

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Fri, 14 Oct 2016 08:54:47 +0000 (10:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  use zend_error instead of zend_error_noreturn

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Remi Collet [Fri, 14 Oct 2016 08:54:09 +0000 (10:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  use zend_error instead of zend_error_noreturn

8 years agouse zend_error instead of zend_error_noreturn
Remi Collet [Fri, 14 Oct 2016 08:53:40 +0000 (10:53 +0200)]
use zend_error instead of zend_error_noreturn

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Fri, 14 Oct 2016 06:09:29 +0000 (08:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Fri, 14 Oct 2016 06:08:10 +0000 (08:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoadd missing NEWS entries for 5.6.27
Ferenc Kovacs [Fri, 14 Oct 2016 06:05:17 +0000 (08:05 +0200)]
add missing NEWS entries for 5.6.27

8 years agosoap #69137 - Invert logic to be correct
Keith Smiley [Fri, 14 Oct 2016 03:56:24 +0000 (23:56 -0400)]
soap #69137 - Invert logic to be correct

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 14 Oct 2016 02:19:16 +0000 (04:19 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: (62 commits)
  missed piece for renaming
  rename publicly exposed symbol to avoid name conflicts
  Ignore non-executable opcodes in line mode of phpdbg_end_oplog()
  Fix #73280: Stack Buffer Overflow in GD dynamicGetbuf
  use already exported symbol
  Revert "export symbol missing by phpdbg"
  Fix outlen for openssl function
  Syncronize with 5.6 - __toString should return ""
  Fix potential overflows in php_pcre_replace_impl
  Fixed bug #73237
  Fixed bug in zend_accel_error() and cleaned up kill_all_lockers()
  Update NEWS
  Fix phpdbg tests after lineno change
  Fix line number of implicit return in pseudo-main scope
  export symbol missing by phpdbg
  Fix accidental PHPDBG_ABI break
  Fix bug #73189 - Memcpy negative size parameter php_resolve_path
  update len in fallback cases
  Add stdin command and -s command line parameter to phpdbg
  Fix bug #73190: memcpy negative parameter _bc_new_num_ex
  ...

8 years agomissed piece for renaming
Anatol Belski [Thu, 13 Oct 2016 13:39:02 +0000 (15:39 +0200)]
missed piece for renaming

(cherry picked from commit 5ba9eab4361cf9d0d9085f969acc2e96b8af3241)

8 years agorename publicly exposed symbol to avoid name conflicts
Anatol Belski [Thu, 13 Oct 2016 13:23:15 +0000 (15:23 +0200)]
rename publicly exposed symbol to avoid name conflicts

(cherry picked from commit 730288ae41fe0d40d00b27174b558cf260b1a7df)

8 years agoIgnore non-executable opcodes in line mode of phpdbg_end_oplog()
Bob Weinand [Thu, 13 Oct 2016 12:09:12 +0000 (14:09 +0200)]
Ignore non-executable opcodes in line mode of phpdbg_end_oplog()

(cherry picked from commit d14498a475642642cfeee21630058941c33a6dfb)

8 years agofix gettimeofday proto availability
Anatol Belski [Thu, 13 Oct 2016 11:08:16 +0000 (13:08 +0200)]
fix gettimeofday proto availability

(cherry picked from commit 79f7d174d07dee4dde1f8eddaba6c741b26edeb3)

8 years agoFix #73280: Stack Buffer Overflow in GD dynamicGetbuf
Christoph M. Becker [Thu, 13 Oct 2016 09:10:02 +0000 (11:10 +0200)]
Fix #73280: Stack Buffer Overflow in GD dynamicGetbuf

We make sure to never pass a negative `rlen` as size to memcpy().

Cf. <https://github.com/libgd/libgd/commit/53110871>.

(cherry picked from commit cc08cbc84d46933c1e9e0149633f1ed5d19e45e9)

8 years agofix test
Anatol Belski [Thu, 13 Oct 2016 08:08:23 +0000 (10:08 +0200)]
fix test

(cherry picked from commit 57354e0313cba1186fd05f74e1c418525269e7f2)

8 years agouse already exported symbol
Anatol Belski [Thu, 13 Oct 2016 07:55:37 +0000 (09:55 +0200)]
use already exported symbol

(cherry picked from commit ce3e792c2c4c251fd5963a36af5ad4a9dd875085)

8 years agoRevert "export symbol missing by phpdbg"
Anatol Belski [Thu, 13 Oct 2016 07:50:32 +0000 (09:50 +0200)]
Revert "export symbol missing by phpdbg"

This reverts commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1.

Overseen strpprintf is there

(cherry picked from commit 3104882cf873308c43dca20bdfd698dd3470a246)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Thu, 13 Oct 2016 06:26:15 +0000 (23:26 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix outlen for openssl function
  Syncronize with 5.6 - __toString should return ""
  Fix potential overflows in php_pcre_replace_impl

(cherry picked from commit ff75665663045a96d6f182e24283e6bebb8537fa)

8 years agoSyncronize with 5.6 - __toString should return ""
Stanislav Malyshev [Thu, 13 Oct 2016 06:08:30 +0000 (23:08 -0700)]
Syncronize with 5.6 - __toString should return ""

(cherry picked from commit 2301608736c82183f8210053a45f78eeef5b0c74)

8 years agoFix potential overflows in php_pcre_replace_impl
Stanislav Malyshev [Thu, 13 Oct 2016 06:07:47 +0000 (23:07 -0700)]
Fix potential overflows in php_pcre_replace_impl

(cherry picked from commit 9c50ba42d6503a5fcfffad6c6823a9bee0e033c0)

8 years agoFixed bug #73237
Keith Smiley [Mon, 27 Jun 2016 18:23:15 +0000 (14:23 -0400)]
Fixed bug #73237

If the response includes both fields with simple types (which get
concatenated into an XML string) and a complex type (which is parsed
into an object), then the object will parsed into the same zval as the
simple types and will overwrite the string.

(cherry picked from commit 26287132c0c48e52dbaf1ac44c1d2f0d0d9b0cf7)

8 years agofix another mistake
Anatol Belski [Wed, 12 Oct 2016 21:07:37 +0000 (23:07 +0200)]
fix another mistake

(cherry picked from commit bec0121733cc5777c4d3fde8e9ff56fe68c039d3)

8 years agoFixed bug in zend_accel_error() and cleaned up kill_all_lockers()
Mitch Hagstrand [Wed, 12 Oct 2016 01:18:59 +0000 (20:18 -0500)]
Fixed bug in zend_accel_error() and cleaned up kill_all_lockers()

1. zend_accel_error was only executing clean up if log_verbosity_level is high enough to log
2. Cleaned up kill_all_lockers function and fixed comments.

(cherry picked from commit bcee2fdbec4f4bba59d4134003cfaf5b1f9b67ab)

8 years agoMerge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
Bob Weinand [Wed, 12 Oct 2016 20:57:41 +0000 (22:57 +0200)]
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1

(cherry picked from commit 457e68626257e8b5c891f2edf20d31907080063a)