php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
98,524 Commits 549 Branches 1,485 Tags
ddaf04053beec2c9bbb63e1d9b99efdb6aabbf4e
Commit Graph

43142 Commits

Author SHA1 Message Date
Keith Smiley ddaf04053b 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 26287132c0)
 2016-10-14 01:57:04 +02:00
Mitch Hagstrand 01a280a9c7 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 bcee2fdbec)
 2016-10-14 01:56:01 +02:00
Anatol Belski 6f9c3b4558 update len in fallback cases 
(cherry picked from commit 58b18892bf)
 2016-10-14 01:49:55 +02:00
Anatol Belski a8a11b669d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73190: memcpy negative parameter _bc_new_num_ex

(cherry picked from commit af1bf873fe)
 2016-10-14 01:46:18 +02:00
Anatol Belski 06e7c9983a fix test 
(cherry picked from commit fa9370db03)
 2016-10-14 01:44:45 +02:00
Stanislav Malyshev 54003ab663 Fix bug #73147: Use After Free in PHP7 unserialize() 
(cherry picked from commit 0e6fe3a4c9)
(cherry picked from commit f42cbd749c)
 2016-10-14 01:44:16 +02:00
Anatol Belski a5e9a73db2 fix typo 
(cherry picked from commit efc1f33b58)
 2016-10-14 01:43:54 +02:00
Anatol Belski 41ed9d1f9f Revert "Fix for #73240 - Write out of bounds at number_format" 
This reverts commit 01280f8deb.

The fix is already merged by Stas.

(cherry picked from commit 80eb013a92)
 2016-10-14 01:43:23 +02:00
Anatol Belski 7897e8cd6c followup with #73276 merge 
(cherry picked from commit b135ba3fa9)
 2016-10-14 01:43:02 +02:00
Anatol Belski 48f06ada89 fix test 
(cherry picked from commit 7c6cb1282d)
 2016-10-14 01:42:50 +02:00
Stanislav Malyshev fe789b3f7c Fix bug #73276 - crash in openssl_random_pseudo_bytes function 
(cherry picked from commit 85a22a0af0)
(cherry picked from commit 7dc8b5e7ae)
 2016-10-14 01:42:19 +02:00
Stanislav Malyshev e7e60851ae Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML() 
(cherry picked from commit 96a8cf8e1b)
(cherry picked from commit 4ef79370a8)
 2016-10-14 01:42:05 +02:00
Stanislav Malyshev 8e2c9024a6 Fix for #73240 - Write out of bounds at number_format 
(cherry picked from commit 8259130b6b)
(cherry picked from commit 01280f8deb)
 2016-10-14 01:41:48 +02:00
Anatol Belski 0cf880e70c avoid strlen 
(cherry picked from commit aaa5d07365)
 2016-10-14 01:41:32 +02:00
Stanislav Malyshev d25e427ab1 Bug #73218: add mitigation for ICU int overflow 
(cherry picked from commit d946d10293)
(cherry picked from commit b26b02b2df)
 2016-10-14 01:41:06 +02:00
Stanislav Malyshev 0d9d133cd6 Add more locale length checks, due to ICU bugs. 
(cherry picked from commit d3eb58332a)
(cherry picked from commit 87a8240b5a)
 2016-10-14 01:40:36 +02:00
Stanislav Malyshev 336322ce63 Fix bug #73150: missing NULL check in dom_document_save_html 
(cherry picked from commit 1c0e9126fb)
(cherry picked from commit d1e878f272)
 2016-10-14 01:40:12 +02:00
Stanislav Malyshev 6b2992f54c Fix for #73240 - Write out of bounds at number_format 
(cherry picked from commit 3b5262ec4c)
 2016-10-14 01:37:13 +02:00
Stanislav Malyshev f901dce575 Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key 
(cherry picked from commit 61cdd1255d)
 2016-10-14 01:36:57 +02:00
Stanislav Malyshev c4254588a9 Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation 
(cherry picked from commit 1b29e4488e)
 2016-10-14 01:36:38 +02:00
Sara Golemon 25d4943b44 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 9f86cdaf7f)
 2016-10-14 01:34:51 +02:00
Dmitry Stogov e92a18dcd5 Fixed referencecounter inference rules 
(cherry picked from commit 6046a99b97)
 2016-10-14 01:24:46 +02:00
Dmitry Stogov 233992409b Fixed referencecounter inference rules 
(cherry picked from commit fae7d6b9bb)
 2016-10-14 01:24:23 +02:00
Anatol Belski 5a2dd84314 add test for bug #73037 
(cherry picked from commit 256b150a96)
 2016-10-14 01:21:18 +02:00
Nikita Popov 28edc971e7 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-10 12:21:15 +02:00
Nikita Popov c91f652ddb Fixed bug #73273 
As well as a few other $_SESSION separation issues.
 2016-10-10 12:20:44 +02:00
Christoph M. Becker 0f40ca989a Merge branch 'PHP-7.0' into PHP-7.1 2016-10-10 12:12:13 +02:00
Christoph M. Becker fb08216b08 Merge branch 'PHP-5.6' into PHP-7.0 2016-10-10 11:45:53 +02:00
Christoph M. Becker fc989fc6e7 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>.
 2016-10-10 11:41:39 +02:00
Dmitry Stogov 3760bc5407 Removed deprecated flag 2016-10-10 11:48:29 +03:00
Dmitry Stogov 771600ee6b Fixed information about possible return value 2016-10-10 11:46:43 +03:00
Christoph M. Becker a16f0c5e01 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-09 15:21:40 +02:00
Christoph M. Becker c930714cbe Merge branch 'PHP-5.6' into PHP-7.0 2016-10-09 15:14:17 +02:00
Christoph M. Becker b92216b97d 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.
 2016-10-09 15:10:34 +02:00
Christoph M. Becker ed282f110b 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.
 2016-10-08 19:47:32 +02:00
Anatol Belski c43a54e4fe Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix leak
 2016-10-08 19:28:21 +02:00
Anatol Belski 6f84ac721b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix leak
 2016-10-08 19:25:36 +02:00
Anatol Belski 3c5742ebd7 fix leak 2016-10-08 19:07:35 +02:00
Christoph M. Becker 1d977e55d9 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>.
 2016-10-08 15:06:07 +02:00
Christoph M. Becker 5540aba258 Fix WS 
As discussed in
<https://github.com/php/php-src/commit/14d4ee93#commitcomment-19344508>.
 2016-10-08 11:22:12 +02:00
Christoph M. Becker 59cd8eb723 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>
 2016-10-08 10:22:04 +02:00
Nikita Popov 9c1c8be7a2 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-08 01:10:37 +02:00
Nikita Popov 159de7723e Merge branch 'PHP-5.6' into PHP-7.0 2016-10-08 01:06:02 +02:00
Nikita Popov b061fa909d Fix bug #73192 2016-10-08 01:04:22 +02:00
Nikita Popov bc3a0b82b8 Revert "Fixed test" 
This reverts commit a10d03ac16.
 2016-10-08 00:43:36 +02:00
Nikita Popov 1c468ee044 Revert "Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986" 
This reverts commit 085dfca02b.
 2016-10-08 00:43:17 +02:00
Christoph M. Becker 14d4ee93a8 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>
 2016-10-08 00:02:21 +02:00
Derick Rethans e3271b1814 Fixed bug #64887 (Allow DateTime modification with subsecond items). 2016-10-07 13:40:06 -04:00
Christoph M. Becker 825e0fd430 Document that ext/shmop deals with resources as of PHP 7.0.0 
Second attempt
 2016-10-07 16:35:37 +02:00
Christoph M. Becker 3afdf9e439 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-07 16:21:52 +02:00