archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
99637 commits 526 branches 1434 tags 879 MiB
Commit graph

99637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joe Watkins
bce17764be Merge branch 'master' of https://github.com/php/php-src 2016-10-10 12:18:40 +01:00
Joe Watkins
fb92482c8a Merge branch 'PHP-7.1' of https://github.com/php/php-src into PHP-7.1 2016-10-10 12:17:11 +01:00
Joe Watkins
b0cacee303 Merge branch 'pull-request/2082' 2016-10-10 12:14:26 +01:00
Danack
9bbda76ca6 Added news entry. 2016-10-10 12:21:59 +01:00
Anatol Belski
63c7a09786 Merge branch 'PHP-7.1' 
* PHP-7.1:
  add zend_bailout to cppcheck conf
 2016-10-10 13:12:34 +02:00
Anatol Belski
4b8bdac8db add zend_bailout to cppcheck conf 2016-10-10 13:11:45 +02:00
Nikita Popov
fcbfd9835d Merge branch 'PHP-7.1' 2016-10-10 12:21:25 +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
4be36b536e Merge branch 'PHP-7.1' 2016-10-10 12:13:07 +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 <77c8d359>.
 2016-10-10 11:41:39 +02:00
Dmitry Stogov
38e765d710 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Removed deprecated flag
  Fixed information about possible return value
 2016-10-10 11:49:12 +03: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
7ce90014e2 Merge branch 'PHP-7.1' 2016-10-09 15:27:14 +02: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
Anatol Belski
3efea8aed2 since libdb isn't bundled, it needs a config option as well 2016-10-08 20:44:35 +02:00
Christoph M. Becker
1f0346d26d Merge branch 'PHP-7.1' 2016-10-08 19:48:43 +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
fd9aaed943 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix leak
 2016-10-08 19:29:08 +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
Nikita Popov
3dda7bf7d0 Merge branch 'PHP-7.1' 2016-10-08 17:01:21 +02:00
Nikita Popov
f8a6df4706 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-08 17:00:56 +02:00
Nikita Popov
2a75f5026a 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.
 2016-10-08 17:00:27 +02:00
Christoph M. Becker
ee2b1e38ef Merge branch 'PHP-7.1' 2016-10-08 15:10:40 +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
0e8cd8ab16 Merge branch 'PHP-7.1' 2016-10-08 11:27:11 +02:00
Christoph M. Becker
5540aba258 Fix WS 
As discussed in
<14d4ee93 (commitcomment-19344508)>.
 2016-10-08 11:22:12 +02:00
Christoph M. Becker
8a68d93995 Merge branch 'PHP-7.1' 2016-10-08 10:42:25 +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
9df6112e01 Merge branch 'PHP-7.1' 2016-10-08 01:10:56 +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
c8fe175c50 Merge branch 'PHP-7.1' 2016-10-08 00:03:32 +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
aed25395e5 Merge branch 'PHP-7.1' 2016-10-07 13:49:08 -04:00
Derick Rethans
61bf62a7c0 Merge branch 'microseconds-modify' into PHP-7.1 2016-10-07 13:49:00 -04:00
Derick Rethans
e3271b1814 Fixed bug #64887 (Allow DateTime modification with subsecond items). 2016-10-07 13:40:06 -04:00
Christoph M. Becker
35cdc215e3 Merge branch 'PHP-7.1' 2016-10-07 16:36:38 +02:00
Christoph M. Becker
e2da66d361 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-07 16:36:13 +02: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