clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 22:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
97,275 Commits 494 Branches 1,367 Tags 790 MiB
59de6fb268
Commit Graph

97275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Davey Shafik
57092c5a68 Merge RFC Additional Context in pcntl_signal Handler 2016-07-20 14:17:04 -07:00
Jakub Zelenka
5507fbe6af Update NEWS with fixed OpenSSL 1.1 build 2016-07-20 19:34:30 +01:00
Jakub Zelenka
e7ee24bf6d Merge branch 'openssl_1_1_port' 2016-07-20 19:32:07 +01:00
Christoph M. Becker
f3a89ff075 Add test case for imagecopyresampled() with alpha 2016-07-20 19:26:29 +02:00
Anatol Belski
be53fab51a Merge branch 'PHP-7.0' 
* PHP-7.0:
  regenerate date parser with re2c 0.13.5 to fix OSX issues
 2016-07-20 18:01:41 +02:00
Anatol Belski
462a9aa190 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  regenerate date parser with re2c 0.13.5 to fix OSX issues
 2016-07-20 18:00:53 +02:00
Anatol Belski
b57a38f584 regenerate date parser with re2c 0.13.5 to fix OSX issues 2016-07-20 17:57:39 +02:00
Anatol Belski
c1ca3c5e6d Merge branch 'PHP-7.0' 
* PHP-7.0:
  regenerate date parser with re2c 0.13.5
 2016-07-20 13:37:17 +02:00
Anatol Belski
90c26fb6b1 regenerate date parser with re2c 0.13.5 2016-07-20 13:32:53 +02:00
Xinchen Hui
6e16ea4135 Fixed arginfo 2016-07-20 18:09:17 +08:00
Xinchen Hui
d169fccae2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed arginfo
 2016-07-20 18:08:48 +08:00
Xinchen Hui
e4af29b0b7 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed arginfo
 2016-07-20 18:07:18 +08:00
Xinchen Hui
9ebc96116b Fixed arginfo 2016-07-20 18:07:02 +08:00
Derick Rethans
533266127a Merge branch 'PHP-7.0' 2016-07-20 10:21:19 +01:00
Derick Rethans
1dafa806a9 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-20 10:21:03 +01:00
Derick Rethans
18ba78e988 Regenerate with the -b flag, as we used to do. 
Apparently, Apple's LLVM can't handle it otherwise o_O.
 2016-07-20 10:19:53 +01:00
Xinchen Hui
5296853fff Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed typo
 2016-07-20 17:01:53 +08:00
Xinchen Hui
cbbe17fb53 Fixed typo 2016-07-20 17:01:42 +08:00
Xinchen Hui
f2fa45062e Update NEWs 2016-07-20 17:00:30 +08:00
Xinchen Hui
9254f5d5d3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72629 (Caught exception assignment to variables ignores references).

Conflicts:
	main/php_version.h
 2016-07-20 17:00:09 +08:00
Xinchen Hui
97c0b133c5 Fixed bug #72629 (Caught exception assignment to variables ignores references). 2016-07-20 16:59:14 +08:00
Xinchen Hui
07b869f367 Update NEWS 2016-07-20 16:13:21 +08:00
Xinchen Hui
c35dab005c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72622 (array_walk + array_replace_recursive create references from nothing)
 2016-07-20 16:12:49 +08:00
Xinchen Hui
3c3b8c8365 Fixed bug #72622 (array_walk + array_replace_recursive create references from nothing) 2016-07-20 16:12:37 +08:00
Stanislav Malyshev
dda0ea9b3a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Improve fix for #72520
  #72482, revert for 5.6 for now
 2016-07-19 22:38:54 -07:00
Stanislav Malyshev
df5ee7bc25 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Improve fix for #72520
  #72482, revert for 5.6 for now

Conflicts:
	ext/zip/zip_stream.c
 2016-07-19 22:38:35 -07:00
Stanislav Malyshev
17a53f9e60 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improve fix for #72520
 2016-07-19 22:37:44 -07:00
Stanislav Malyshev
8ebdb1f5fd Improve fix for #72520 2016-07-19 22:37:03 -07:00
Jakub Zelenka
98ac90b7e2 Add missing X509_get_signature_nid for 1.0.1 2016-07-19 20:13:13 +01:00
Jakub Zelenka
d8580cb286 Use always non const SSL cipher version string 2016-07-19 20:01:20 +01:00
Anatol Belski
a179b148d7 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update UPGRADING
 2016-07-19 20:35:04 +02:00
Anatol Belski
ec97e78a8d update UPGRADING 2016-07-19 20:34:22 +02:00
Anatol Belski
805f995cfd Merge branch 'PHP-7.0' 
* PHP-7.0:
  sync NEWS
 2016-07-19 20:28:05 +02:00
Anatol Belski
1eb13c5204 sync NEWS 2016-07-19 20:27:30 +02:00
Pierre Joye
e8b768dd92 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2016-07-20 00:18:56 +07:00
Pierre Joye
9cc0a5a9a9 #72482, revert for 5.6 for now 2016-07-20 00:18:25 +07:00
Christoph M. Becker
617e9ccd8c Merge branch 'PHP-7.0' 2016-07-19 18:02:23 +02:00
Christoph M. Becker
d42ce593ff Merge branch 'PHP-5.6' into PHP-7.0 2016-07-19 18:00:49 +02:00
Christoph M. Becker
206d45bc17 Update NEWS 2016-07-19 17:58:29 +02:00
Christoph M. Becker
604a2a20a4 Merge branch 'PHP-7.0' 2016-07-19 17:50:45 +02:00
Christoph M. Becker
8466155ff5 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-19 17:41:16 +02:00
Christoph M. Becker
828f911efd Fix #43828: broken transparency of imagearc for truecolor in blendingmode 
No pixel of a filled arc must ever be drawn multiple times. Otherwise we get
artifacts regarding transparency. That happens with the current
implementation of gdImageFilledArc() unless gdChord or gdNoFill are set.
When gdPie is set, however, the filled arc is drawn in wedges, which are
polygons of three points, and so some overlap is natural.

To resolve the issue, we stick with the current algorithm of calculating the
wedges, but instead of drawing each polygon separately, we put the relevant
points in a large array, and draw a single polygon. That also is supposed to
improve the performance considerably.

Note that this modification will change the results when gdImageSetStyle()
or gdImageSetBrush() are used, but we believe that this modification is also
an improvement in this regard, even though it still might not make much
sense to use these functions with gdImageFilledArc().

The respective fix for libgd is
<https://github.com/libgd/libgd/commit/e7e20d6>.
 2016-07-19 17:38:26 +02:00
Anatol Belski
ab39b094d2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix for bug #72513
 2016-07-19 17:23:51 +02:00
Stanislav Malyshev
374ae8e9da Fix for bug #72513 
This is applicable to 7 as well, but was somehow missing from the merge.
 2016-07-19 17:18:24 +02:00
Anatol Belski
ce555fd1d6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test out
 2016-07-19 15:07:10 +02:00
Anatol Belski
8e0594a944 fix test out 
this test also affected by #70313 which is not in the release branch
 2016-07-19 15:05:14 +02:00
Anatol Belski
e0fdf261bf Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test portability and expectation
 2016-07-19 14:51:26 +02:00
Anatol Belski
6571a90f7f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix test portability and expectation
 2016-07-19 14:50:45 +02:00
Anatol Belski
bd1919504b fix test portability and expectation 
The test images for #72603 and #72618 are broken, that seems to be
the cause of different test output. Seems also to be platform dependent,
so it's not reliable to depend on the exact error output.
 2016-07-19 14:49:24 +02:00
Pierre Joye
439e2ae516 Merge branch 'PHP-7.0' 
* PHP-7.0:
  #72482, Ilegal write/read access caused by gdImageAALine overflow
  fix #72494, improve input color check and prevent issues when old gd are used, done before gd call
  improve fix #72558, free contribRow as well
 2016-07-19 19:35:40 +07:00