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

10492 Commits

Author SHA1 Message Date
Nikita Popov cbde0a6fc2 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-23 22:27:11 +02:00
Nikita Popov 89d3e234af Fix test output 
Changed due to eca84946a4.
 2016-10-23 22:26:25 +02:00
Nikita Popov 736633310c Merge branch 'PHP-7.0' into PHP-7.1 2016-10-20 13:26:34 +02:00
Adam Saponara 55d17662cb 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.
 2016-10-20 13:22:04 +02:00
Leigh f5244f336a Merge branch 'PHP-7.0' into PHP-7.1 2016-10-20 10:18:16 +01:00
Leigh c3361f16c7 Add php_random_int internal API 
This is the internal API compliment to `php_random_bytes`
 2016-10-20 10:18:07 +01:00
Dmitry Stogov 9ded1b4edb Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu) 2016-10-19 23:10:42 +03:00
Joe Watkins 689cf8b266 Revert "Fix bug #47890 #73215 uniqid() should use better random source" 
This reverts commit 48f1a17886.
 2016-10-18 11:30:33 +01:00
Joe Watkins 8c74be0c52 Revert "Fix bug #47890 #73215 uniqid() should use better random source" 
This reverts commit 48f1a17886.
 2016-10-18 11:30:19 +01:00
Yasuo Ohgaki 235cb691e1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #47890 #73215 uniqid() should use better random source
 2016-10-18 09:14:48 +09:00
Yasuo Ohgaki 48f1a17886 Fix bug #47890 #73215 uniqid() should use better random source 2016-10-18 09:13:42 +09:00
Joe Watkins b274be5d9d Merge branch 'pull-request/1808' 2016-10-17 17:02:07 +01:00
Joe Watkins 6806a41e7f Merge branch 'pull-request/1808' 2016-10-17 17:00:50 +01: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
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
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
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
Anatol Belski 80eb013a92 Revert "Fix for #73240 - Write out of bounds at number_format" 
This reverts commit 01280f8deb.

The fix is already merged by Stas.
 2016-10-12 16:12:18 +02:00
Stanislav Malyshev 01280f8deb Fix for #73240 - Write out of bounds at number_format 
(cherry picked from commit 8259130b6b)
 2016-10-12 14:55:00 +02:00
Sara Golemon 4d11a8eedf 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
 2016-10-11 21:44:14 -07:00
Stanislav Malyshev 1bdb30a429 Merge branch 'PHP-7.0.12' into PHP-7.0 
* PHP-7.0.12:
  set versions and release date
  sync NEWS
  Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
  Fix for #73240 - Write out of bounds at number_format
  Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key
  set versions
  Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation
 2016-10-11 16:46:51 -07:00
Stanislav Malyshev 9c675607e6 Merge remote-tracking branch 'origin/PHP-7.0.12' into PHP-7.0.12 
* origin/PHP-7.0.12: (99 commits)
  set versions and release date
  sync NEWS
  Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
  set versions
  update NEWS
  Ignore potentially misleading dberr values
  update NEWS
  Fixed bug #73172 parse error: Invalid numeric literal
  Fix #53745: cgi.discard_path option is missing from php.ini
  update libs_versions.txt
  update libs_versions.txt
  Fixed bug #73156 (segfault on undefined function)
  Add an include path for freetype which is relevant for cmake builds
  Fix test_image_equals_file() wrt. palette images
  Fixed bug #73163
  Fix #73161: imagecreatefromgd2() may leak memory
  Fix #73159: imagegd2(): unrecognized formats may result in corrupted files
  Fix #73155: imagegd2() writes wrong chunk sizes on boundaries
  Fix #73157 (again): imagegd2() ignores 3rd param if 4 are given
  Fix #73157: imagegd2() ignores 3rd param if 4 are given
  ...
 2016-10-11 16:27:13 -07:00
Stanislav Malyshev 3b5262ec4c Fix for #73240 - Write out of bounds at number_format 2016-10-10 23:49:28 -07: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
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
Anatol Belski d5b77d6662 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73037, second round
 2016-10-05 15:04:55 +02:00
Anatol Belski 5b79e95f7b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #73037, second round
 2016-10-05 15:03:38 +02:00
Anatol Belski 07546496b1 Fix bug #73037, second round 2016-10-05 14:54:06 +02:00
Stanislav Malyshev 56e19b7c75 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.
 2016-10-04 21:56:28 -07:00
Ilia Alshanetsky a10d03ac16 Fixed test 2016-10-04 21:20:38 -07:00
Ilia Alshanetsky 085dfca02b Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986 2016-10-04 21:20:31 -07:00
Craig Duncan 6e31aad8b8 Skip tests that rely on sessions if sessions aren't available 2016-10-04 20:51:18 +01:00
Stanislav Malyshev 8ea01d5f19 Apparently negative wordwrap is a thing and should work as length = 0. 
I'll leave it as is for now.
 2016-10-03 19:17:42 -07:00
Stanislav Malyshev 631173aa5c Really fix bug #73017 2016-10-03 18:07:21 -07:00
Nikita Popov 02ba9d71ab Unwrap reference returns in cufa etc 2016-09-30 22:10:01 +02:00
Christoph M. Becker 6656d32eb3 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-30 11:49:51 +02:00
Christoph M. Becker dd93712911 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-30 11:40:55 +02:00
Christoph M. Becker e72165bb86 Fix #73203: passing additional_parameters causes mail to fail 
We make sure that there's no unsigned underflow, which happened for `y==0`.
 2016-09-30 11:38:09 +02:00
Joe Watkins 98705148f0 fix user filter bug 2016-09-30 07:22:15 +01:00
Joe Watkins a8d031fbd8 fix user filter bug 2016-09-30 07:21:01 +01:00
Nikita Popov 4c0804c07d Ensure symtable exists before checking it 2016-09-28 19:20:17 +02:00
Xinchen Hui 6617e87700 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed skip
 2016-09-21 17:20:35 +08:00