php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
97,216 Commits 549 Branches 1,485 Tags
f775199ac70abef4bf7fa29c805d73df09131e21
Commit Graph

42304 Commits

Author SHA1 Message Date
Lauri Kenttä f775199ac7 Require strict base64 in openssl_decode 
Using invalid data in a security-related context makes no sense,
and there's even a test which depends on invalid base64 data failing,
even though it currently fails for the wrong reasons by sheer luck.
 2016-07-22 18:03:55 +02:00
Lauri Kenttä 76f6f3583c Fix test: Use valid base64 even for invalid OpenSSL data 2016-07-22 18:03:55 +02:00
Nikita Popov dc04f2d2db Merge branch 'PHP-7.0' into PHP-7.1 2016-07-22 17:22:29 +02:00
Nikita Popov 7d77289717 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-22 17:22:13 +02:00
Nikita Popov 4fc1bfa93b Make IntlCalendar::getNow() test more tolerant 
Due to the *1000 factor the two values may be off-by-1000 even
without any actual delay, so increase the check to 2000.
 2016-07-22 17:20:56 +02:00
Xinchen Hui 6929121423 Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements) 2016-07-22 23:15:15 +08:00
Xinchen Hui df358a1c06 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
 2016-07-22 23:14:28 +08:00
Xinchen Hui 516837344e Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements) 2016-07-22 23:13:42 +08:00
Christoph M. Becker a6953e70e5 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-22 15:29:18 +02:00
Christoph M. Becker 9a2207c90a Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/spl/spl_directory.c
 2016-07-22 15:27:55 +02:00
Christoph M. Becker 6b116932b2 Fix #72646: SplFileObject::getCsvControl does not return the escape character 
This has obviously been missed when adding the $escape parameter to
SplFileObject::setCsvControl() in PHP 5.3, so we catch up on this.
 2016-07-22 15:24:50 +02:00
Christoph M. Becker 9c8b2c8689 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-21 18:53:42 +02:00
Christoph M. Becker 4472f9e822 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-21 18:39:27 +02:00
Christoph M. Becker f2c2a4be9e Fix #72330: CSV fields incorrectly split if escape char followed by UTF chars 
We must not forget to properly reset the state for multibyte characters
following an escape character.
 2016-07-21 18:37:24 +02:00
Remi Collet a2a122804e bump zip extension version 2016-07-21 08:44:26 +02:00
Remi Collet 7ac330d63a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  bump zip extension version
 2016-07-21 08:43:49 +02:00
Remi Collet 61ce933d38 bump zip extension version 2016-07-21 08:42:53 +02:00
Xinchen Hui bdd3f77be0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property)
 2016-07-21 14:25:36 +08:00
Xinchen Hui 4a643e5e13 Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property) 2016-07-21 14:25:15 +08:00
Davey Shafik 57092c5a68 Merge RFC Additional Context in pcntl_signal Handler 2016-07-20 14:17:04 -07: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 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 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 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 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
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 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 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