]> granicus.if.org Git - php/log
php
8 years agofinish 7.1 port
Anatol Belski [Wed, 12 Oct 2016 16:31:46 +0000 (18:31 +0200)]
finish 7.1 port

(cherry picked from commit f1fff032fcdb09a56c2fd763d1ee160106381586)

8 years agoFix bug #73147: Use After Free in PHP7 unserialize()
Stanislav Malyshev [Mon, 26 Sep 2016 02:53:59 +0000 (19:53 -0700)]
Fix bug #73147: Use After Free in PHP7 unserialize()

(cherry picked from commit 0e6fe3a4c96be2d3e88389a5776f878021b4c59f)
(cherry picked from commit f42cbd749cde1f91274c1d03df9024baba141a8f)

8 years agofix typo
Anatol Belski [Wed, 12 Oct 2016 15:12:38 +0000 (17:12 +0200)]
fix typo

(cherry picked from commit efc1f33b58b0936539ea6ca1de345bd83c7e8f26)

8 years agoRevert "Fix for #73240 - Write out of bounds at number_format"
Anatol Belski [Wed, 12 Oct 2016 14:11:32 +0000 (16:11 +0200)]
Revert "Fix for #73240 - Write out of bounds at number_format"

This reverts commit 01280f8deb837a61237a619cffa886d7f8c31963.

The fix is already merged by Stas.

(cherry picked from commit 80eb013a926fad18cb0da05c508f564da3c1d88c)

8 years agofollowup with #73276 merge
Anatol Belski [Wed, 12 Oct 2016 14:03:35 +0000 (16:03 +0200)]
followup with #73276 merge

(cherry picked from commit b135ba3fa93fd4f085322573d2850b29cb662e21)

8 years agofix test
Anatol Belski [Wed, 12 Oct 2016 14:03:09 +0000 (16:03 +0200)]
fix test

(cherry picked from commit 7c6cb1282d539c4d5ff5adc8f7a6926c83b98e20)

8 years agoFix bug #73276 - crash in openssl_random_pseudo_bytes function
Stanislav Malyshev [Tue, 11 Oct 2016 20:37:47 +0000 (13:37 -0700)]
Fix bug #73276 - crash in openssl_random_pseudo_bytes function

(cherry picked from commit 85a22a0af0722ef3a8d49a056a0b2b18be1fb981)
(cherry picked from commit 7dc8b5e7aefce963a7a222c48ee3506725c4776b)

8 years agoFix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
Stanislav Malyshev [Tue, 11 Oct 2016 20:30:52 +0000 (13:30 -0700)]
Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()

(cherry picked from commit 96a8cf8e1b5dc1b0c708bb5574e0d6727cc56d9e)
(cherry picked from commit 4ef79370a82d6c92f4ea0cd462274ba24e007f56)

8 years agoFix for #73240 - Write out of bounds at number_format
Stanislav Malyshev [Tue, 11 Oct 2016 06:42:50 +0000 (23:42 -0700)]
Fix for #73240 - Write out of bounds at number_format

(cherry picked from commit 8259130b6bc752968856b352c9e7f8e03a8c0a8e)
(cherry picked from commit 01280f8deb837a61237a619cffa886d7f8c31963)

8 years agoavoid strlen
Anatol Belski [Wed, 12 Oct 2016 11:28:23 +0000 (13:28 +0200)]
avoid strlen

(cherry picked from commit aaa5d07365b54f35ba3b5024492450f3d2fe4ee5)

8 years agoBug #73218: add mitigation for ICU int overflow
Stanislav Malyshev [Wed, 5 Oct 2016 05:40:09 +0000 (22:40 -0700)]
Bug #73218: add mitigation for ICU int overflow

(cherry picked from commit d946d102936525bc7dcd01f3827d0a6e0bb971b0)
(cherry picked from commit b26b02b2df95eaa647ea3f4e7b42bd11eea4ed2c)

8 years agoAdd more locale length checks, due to ICU bugs.
Stanislav Malyshev [Wed, 5 Oct 2016 04:28:40 +0000 (21:28 -0700)]
Add more locale length checks, due to ICU bugs.

(cherry picked from commit d3eb58332af433982f1e2ae9095fb087974a95f2)
(cherry picked from commit 87a8240b5adc730153e6df54f33195aee1325e6f)

8 years agoFix bug #73150: missing NULL check in dom_document_save_html
Stanislav Malyshev [Mon, 26 Sep 2016 04:25:01 +0000 (21:25 -0700)]
Fix bug #73150: missing NULL check in dom_document_save_html

(cherry picked from commit 1c0e9126fbfb7fde3173347b7464237f56c38bfa)
(cherry picked from commit d1e878f2726e65502fdd992c5b57feeada57893f)

8 years agoFix for #73240 - Write out of bounds at number_format
Stanislav Malyshev [Tue, 11 Oct 2016 06:42:50 +0000 (23:42 -0700)]
Fix for #73240 - Write out of bounds at number_format

(cherry picked from commit 3b5262ec4c9a6f985f8ff1fb4a7bed18f1b48f75)

8 years agoFix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object...
Stanislav Malyshev [Tue, 11 Oct 2016 05:54:29 +0000 (22:54 -0700)]
Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key

(cherry picked from commit 61cdd1255d5b9c8453be71aacbbf682796ac77d4)

8 years agoFix bug #73091 - Unserializing DateInterval object may lead to __toString invocation
Stanislav Malyshev [Sun, 25 Sep 2016 23:43:24 +0000 (16:43 -0700)]
Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation

(cherry picked from commit 1b29e4488e19c89e5b37ecb26acaec443d7f1355)

8 years agoFixed bug #73288 (Segfault in __clone > Exception.toString > __get)
Xinchen Hui [Wed, 12 Oct 2016 08:07:56 +0000 (16:07 +0800)]
Fixed bug #73288 (Segfault in __clone > Exception.toString > __get)

Actually this is caused by optimization(opcache)

(cherry picked from commit d19898b2981c839f0758571c1b83052111634154)

8 years agoClear FG(user_stream_current_filename) when bailing out
Sara Golemon [Wed, 12 Oct 2016 04:35:10 +0000 (21:35 -0700)]
Clear FG(user_stream_current_filename) when bailing out

If a userwrapper opener E_ERRORs then FG(user_stream_current_filename)
would remain set until the next request and would not be pointing
at unallocated memory.

Catch the bailout, clear the variable, then continue bailing.

Closes https://bugs.php.net/bug.php?id=73188

(cherry picked from commit 9f86cdaf7fc44c0d97a35bc4d04622e3d3d53f4d)

8 years agoFixed referencecounter inference rules
Dmitry Stogov [Tue, 11 Oct 2016 12:43:23 +0000 (15:43 +0300)]
Fixed referencecounter inference rules

(cherry picked from commit 6046a99b97b5abab2e75d73bc9d73062f1943126)

8 years agoFixed referencecounter inference rules
Dmitry Stogov [Mon, 10 Oct 2016 22:58:30 +0000 (01:58 +0300)]
Fixed referencecounter inference rules

(cherry picked from commit fae7d6b9bbb3eaf053fb9eb43bc5ceabb34c87f7)

8 years agoadd test for bug #73037
Anatol Belski [Mon, 10 Oct 2016 13:59:52 +0000 (15:59 +0200)]
add test for bug #73037

(cherry picked from commit 256b150a963337eeea5d42e3769ebf5ae45f50c8)

8 years agoUpdate UPGRADING
Yasuo Ohgaki [Thu, 13 Oct 2016 22:52:51 +0000 (07:52 +0900)]
Update UPGRADING

8 years agoadd zend_bailout to cppcheck conf
Anatol Belski [Sat, 8 Oct 2016 17:36:19 +0000 (19:36 +0200)]
add zend_bailout to cppcheck conf

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Mon, 10 Oct 2016 10:20:51 +0000 (12:20 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #73273
Nikita Popov [Mon, 10 Oct 2016 10:17:40 +0000 (12:17 +0200)]
Fixed bug #73273

As well as a few other $_SESSION separation issues.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Mon, 10 Oct 2016 10:05:47 +0000 (12:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 10 Oct 2016 09:44:58 +0000 (11:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73279: Integer overflow in gdImageScaleBilinearPalette()
Christoph M. Becker [Mon, 10 Oct 2016 09:40:16 +0000 (11:40 +0200)]
Fix #73279: Integer overflow in gdImageScaleBilinearPalette()

The color components are supposed to be in range 0..255, so we must not
cast them to `signed char`, what can be the default for `char`.

Port of <https://github.com/libgd/libgd/commit/77c8d359>.

8 years agoRemoved deprecated flag
Dmitry Stogov [Mon, 10 Oct 2016 08:48:29 +0000 (11:48 +0300)]
Removed deprecated flag

8 years agoFixed information about possible return value
Dmitry Stogov [Mon, 10 Oct 2016 08:46:43 +0000 (11:46 +0300)]
Fixed information about possible return value

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 9 Oct 2016 13:20:37 +0000 (15:20 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 9 Oct 2016 13:13:32 +0000 (15:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73272: imagescale() affects imagesetinterpolation()
Christoph M. Becker [Sun, 9 Oct 2016 12:59:37 +0000 (14:59 +0200)]
Fix #73272: imagescale() affects imagesetinterpolation()

We must not permanently change the interpolation method, but rather
have to restore the old method after we're done with scaling the image.

8 years agoRemove channels from getimagesize() results for WebP
Christoph M. Becker [Sat, 8 Oct 2016 17:34:13 +0000 (19:34 +0200)]
Remove channels from getimagesize() results for WebP

Both lossless and lossy WebP can have an alpha channel, but this is
somewhat hard to detect. Furthermore, it is not clear whether an alpha
channel should be counted for getimagesize(). Therefore we remove the
`channel` element from the result array.

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

* PHP-7.0:
  fix leak

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Sat, 8 Oct 2016 17:25:36 +0000 (19:25 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix leak

8 years agofix leak
Anatol Belski [Sat, 8 Oct 2016 17:07:35 +0000 (19:07 +0200)]
fix leak

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 8 Oct 2016 15:00:56 +0000 (17:00 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #66773, #66862
Nikita Popov [Sat, 8 Oct 2016 14:56:17 +0000 (16:56 +0200)]
Fix bug #66773, #66862

This a partial backport of 8754b19. It
a) fixes the class/function/constant import table confusion in the
   namespaced case, and
b) restricts conflict checks to a single file based on a filename
   pointer comparison.

It does not fix the issues with filename reuse (e.g. due to eval)
and late-bound classes. This part of the change requires globals
changes.

8 years agoAdd VP8X support to getimagesize() and friends
Christoph M. Becker [Sat, 8 Oct 2016 13:04:35 +0000 (15:04 +0200)]
Add VP8X support to getimagesize() and friends

This ammends commit 14d4ee93 to also add support for the extended
WebP format, according to
<https://developers.google.com/speed/webp/docs/riff_container>.

8 years agoFix WS
Christoph M. Becker [Sat, 8 Oct 2016 09:22:12 +0000 (11:22 +0200)]
Fix WS

As discussed in
<https://github.com/php/php-src/commit/14d4ee93#commitcomment-19344508>.

8 years agoAdd VP8L support to getimagesize() and friends
Christoph M. Becker [Sat, 8 Oct 2016 08:14:59 +0000 (10:14 +0200)]
Add VP8L support to getimagesize() and friends

This ammends commit 14d4ee93 to also add support for simple lossless
WebP, according to
<https://chromium.googlesource.com/webm/libwebp/+/master/doc/webp-lossless-bitstream-spec.txt>

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 7 Oct 2016 23:10:37 +0000 (01:10 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Fri, 7 Oct 2016 23:06:02 +0000 (01:06 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix bug #73192
Nikita Popov [Fri, 7 Oct 2016 23:04:22 +0000 (01:04 +0200)]
Fix bug #73192

8 years agoRevert "Fixed test"
Nikita Popov [Fri, 7 Oct 2016 22:43:36 +0000 (00:43 +0200)]
Revert "Fixed test"

This reverts commit a10d03ac166daba646b6023e0f12e9ee8040c909.

8 years agoRevert "Added validation to parse_url() to prohibit restricted characters inside...
Nikita Popov [Fri, 7 Oct 2016 22:43:17 +0000 (00:43 +0200)]
Revert "Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986"

This reverts commit 085dfca02b64588317a233eb191d07a75511fff2.

8 years agoImplement #65038: IMAGETYPE_WEBP constant missing
Christoph M. Becker [Fri, 7 Oct 2016 17:25:59 +0000 (19:25 +0200)]
Implement #65038: IMAGETYPE_WEBP constant missing

We add WebP support for getimagesize(), getimagesizefromstring)(),
image_type_to_extension() and image_type_to_mime_type(). For now we
care only about the simple lossy WebP format (VP8) and ignore the
lossless (VP8L) and extended (VP8X) formats. We use image/webp as MIME
type as it appears to be pretty common, even though it is not yet
registered with IANA.

Relevant specifications:
 * <https://developers.google.com/speed/webp/docs/riff_container>
 * <https://tools.ietf.org/html/rfc6386>

8 years agoMerge branch 'microseconds-modify' into PHP-7.1
Derick Rethans [Fri, 7 Oct 2016 17:49:00 +0000 (13:49 -0400)]
Merge branch 'microseconds-modify' into PHP-7.1

8 years agoFixed bug #64887 (Allow DateTime modification with subsecond items).
Derick Rethans [Fri, 7 Oct 2016 17:40:06 +0000 (13:40 -0400)]
Fixed bug #64887 (Allow DateTime modification with subsecond items).

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 7 Oct 2016 14:36:13 +0000 (16:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoDocument that ext/shmop deals with resources as of PHP 7.0.0
Christoph M. Becker [Fri, 7 Oct 2016 14:35:37 +0000 (16:35 +0200)]
Document that ext/shmop deals with resources as of PHP 7.0.0

Second attempt

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 7 Oct 2016 14:21:52 +0000 (16:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoDocument that ext/shmop deals with resources as of PHP 7.0.0
Christoph M. Becker [Fri, 7 Oct 2016 14:13:24 +0000 (16:13 +0200)]
Document that ext/shmop deals with resources as of PHP 7.0.0

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 6 Oct 2016 09:03:09 +0000 (11:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix datatype

8 years agofix datatype
Anatol Belski [Thu, 6 Oct 2016 09:01:27 +0000 (11:01 +0200)]
fix datatype

8 years agoUse better fix for preventing too early freeing of interned strings
Bob Weinand [Thu, 6 Oct 2016 08:36:12 +0000 (10:36 +0200)]
Use better fix for preventing too early freeing of interned strings
Works also with opcache now - just prevent zend_interned_strings_restore completely - zend_interned_strings_dtor will take care as phpdbg only ever uses one single request cycle per module cycle

8 years agoUpdated reference-counting inferece rules.
Dmitry Stogov [Thu, 6 Oct 2016 08:08:01 +0000 (11:08 +0300)]
Updated reference-counting inferece rules.
The previous rules refected PHP-5 behavior and were completely wrong for PHP-7. (e.g. scalars don't have reference counters at all).
This change shouldn't affect anything, because results of this inference are not used yet.

8 years agoFix NEWS after re-roll of RC3
Davey Shafik [Wed, 5 Oct 2016 20:07:47 +0000 (13:07 -0700)]
Fix NEWS after re-roll of RC3

8 years agoMerge branch 'microseconds' into PHP-7.1
Derick Rethans [Wed, 5 Oct 2016 19:32:11 +0000 (15:32 -0400)]
Merge branch 'microseconds' into PHP-7.1

8 years agoImprove support for microseconds with Date/Time microseconds
Derick Rethans [Wed, 5 Oct 2016 15:24:15 +0000 (11:24 -0400)]
Improve support for microseconds with Date/Time

It fixes several bugs:

- Fixed bug #45554 (Inconsistent behavior of the u format char).
- Fixed bug #48225 (DateTime parser doesn't set microseconds for "now").
- Fixed bug #52514 (microseconds are missing in DateTime class).
- Fixed bug #52519 (microseconds in DateInterval are missing).
- Fixed bug #68506 (General DateTime improvments needed for microseconds to become useful).
- Fixed bug #73109 (timelib_meridian doesn't parse dots correctly).
- Fixed bug #73247 (DateTime constructor does not initialise microseconds property).

It also updates timelib to 2016.04, and updates a data mapping file, which
causes changes to the volatile abbreviations tests.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 5 Oct 2016 13:04:55 +0000 (15:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #73037, second round

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Wed, 5 Oct 2016 13:03:38 +0000 (15:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #73037, second round

8 years agoFix bug #73037, second round
Anatol Belski [Wed, 5 Oct 2016 12:54:06 +0000 (14:54 +0200)]
Fix bug #73037, second round

8 years agoMerge branch 'pull-request/2155' into PHP-7.1
Christoph M. Becker [Wed, 5 Oct 2016 11:07:39 +0000 (13:07 +0200)]
Merge branch 'pull-request/2155' into PHP-7.1

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Wed, 5 Oct 2016 10:20:06 +0000 (12:20 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoUpdate run command for allowing STDIN
Bob Weinand [Wed, 5 Oct 2016 10:14:02 +0000 (12:14 +0200)]
Update run command for allowing STDIN

8 years agoRemove phpdbg fix targeting 7.1 which landed in 7.0
Bob Weinand [Wed, 5 Oct 2016 10:08:20 +0000 (12:08 +0200)]
Remove phpdbg fix targeting 7.1 which landed in 7.0

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Wed, 5 Oct 2016 04:57:28 +0000 (21:57 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed test
  Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986
  Apparently negative wordwrap is a thing and should work as length = 0.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Wed, 5 Oct 2016 04:56:28 +0000 (21:56 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed test
  Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986
  Apparently negative wordwrap is a thing and should work as length = 0.

8 years agoFixed test
Ilia Alshanetsky [Wed, 28 Oct 2015 22:38:54 +0000 (18:38 -0400)]
Fixed test

8 years agoAdded validation to parse_url() to prohibit restricted characters inside login/pass...
Ilia Alshanetsky [Tue, 27 Oct 2015 16:40:53 +0000 (12:40 -0400)]
Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986

8 years agoSkip tests that rely on sessions if sessions aren't available
Craig Duncan [Tue, 4 Oct 2016 19:15:09 +0000 (20:15 +0100)]
Skip tests that rely on sessions if sessions aren't available

8 years agoApparently negative wordwrap is a thing and should work as length = 0.
Stanislav Malyshev [Tue, 4 Oct 2016 02:17:42 +0000 (19:17 -0700)]
Apparently negative wordwrap is a thing and should work as length = 0.

I'll leave it as is for now.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Tue, 4 Oct 2016 01:39:05 +0000 (18:39 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Really fix bug #73017

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Tue, 4 Oct 2016 01:37:24 +0000 (18:37 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Really fix bug #73017

8 years agoReally fix bug #73017
Stanislav Malyshev [Tue, 4 Oct 2016 01:06:59 +0000 (18:06 -0700)]
Really fix bug #73017

8 years agoFix #73207: Array ordering is same between 5.6.21 and 7.1.0 RC3
Christoph M. Becker [Mon, 3 Oct 2016 16:55:39 +0000 (18:55 +0200)]
Fix #73207: Array ordering is same between 5.6.21 and 7.1.0 RC3

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Mon, 3 Oct 2016 10:55:23 +0000 (12:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix crash on Linux due to double fclose()
Bob Weinand [Mon, 3 Oct 2016 10:55:06 +0000 (12:55 +0200)]
Fix crash on Linux due to double fclose()

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sun, 2 Oct 2016 11:46:22 +0000 (12:46 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix run command args passing when inmidst execution
Bob Weinand [Sun, 2 Oct 2016 11:45:20 +0000 (12:45 +0100)]
Fix run command args passing when inmidst execution

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 1 Oct 2016 18:14:26 +0000 (19:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoAdd proper escape sequences and reading stdin from file in phpdbg run command
Bob Weinand [Sat, 1 Oct 2016 17:54:44 +0000 (18:54 +0100)]
Add proper escape sequences and reading stdin from file in phpdbg run command

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 1 Oct 2016 17:06:05 +0000 (19:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 1 Oct 2016 17:05:48 +0000 (19:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix leak in zend_exception_error
Nikita Popov [Sat, 1 Oct 2016 17:03:54 +0000 (19:03 +0200)]
Fix leak in zend_exception_error

Only occurs if a non-fatal severity level is used, e.g. when using
interactive mode.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 1 Oct 2016 09:47:31 +0000 (10:47 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix invalid access to interned strings after they are freed in phpdbg
Bob Weinand [Sat, 1 Oct 2016 09:46:21 +0000 (10:46 +0100)]
Fix invalid access to interned strings after they are freed in phpdbg

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 30 Sep 2016 21:55:29 +0000 (23:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 30 Sep 2016 21:46:28 +0000 (23:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73213: Integer overflow in imageline() with antialiasing
Christoph M. Becker [Fri, 30 Sep 2016 21:25:23 +0000 (23:25 +0200)]
Fix #73213: Integer overflow in imageline() with antialiasing

We port the respective fixes <https://github.com/libgd/libgd/commit/eca37d620>
and <https://github.com/libgd/libgd/commit/837b7327> to our bundled libgd.

8 years agoUnwrap reference returns in cufa etc
Nikita Popov [Fri, 30 Sep 2016 20:08:08 +0000 (22:08 +0200)]
Unwrap reference returns in cufa etc

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Fri, 30 Sep 2016 19:50:00 +0000 (20:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Fri, 30 Sep 2016 19:49:53 +0000 (20:49 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFixed tests due to changes in underlaying data
Derick Rethans [Fri, 30 Sep 2016 19:49:44 +0000 (20:49 +0100)]
Fixed tests due to changes in underlaying data

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Fri, 30 Sep 2016 19:31:16 +0000 (20:31 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Fri, 30 Sep 2016 19:31:05 +0000 (20:31 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFixed parsing of AM/PM without all the expected dots in place
Derick Rethans [Fri, 30 Sep 2016 19:21:48 +0000 (20:21 +0100)]
Fixed parsing of AM/PM without all the expected dots in place

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 30 Sep 2016 09:46:06 +0000 (11:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1