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,245 Commits 494 Branches 1,367 Tags 790 MiB
3d95cc50a7
Commit Graph

97245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
3d95cc50a7 fix test 2016-07-23 21:06:11 +02:00
Anatol Belski
b238211732 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test
 2016-07-23 21:04:52 +02:00
Anatol Belski
958fa34c16 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix test
 2016-07-23 21:03:45 +02:00
Anatol Belski
80fee637f4 fix test 2016-07-23 20:55:39 +02:00
Christoph M. Becker
8aa9ddb4d2 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 19:38:45 +02:00
Christoph M. Becker
2c0a18480d Merge branch 'PHP-5.6' into PHP-7.0 2016-07-23 19:36:53 +02:00
Christoph M. Becker
88838dd282 Fix #68712: suspicious if-else statements 2016-07-23 19:29:43 +02:00
Christoph M. Becker
88bc54d3dc Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 18:13:29 +02:00
Christoph M. Becker
03ccd42b18 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-23 18:12:14 +02:00
Christoph M. Becker
9fbd0c1ff1 Fix copy&paste errors in gd_interpolation.c 
According to <https://github.com/libgd/libgd/commit/f101380>.
 2016-07-23 18:09:18 +02:00
Christoph M. Becker
03eeea4aa5 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 16:57:12 +02:00
Christoph M. Becker
5056d59f96 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-23 16:55:16 +02:00
Christoph M. Becker
2c16b9cf62 Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c 
This issue has already been fixed in libgd[1], so we fix PHP's bundled
libgd accordingly.

[1] <https://github.com/libgd/libgd/commit/aa1d71c>
 2016-07-23 16:48:07 +02:00
Bob Weinand
35764e3579 Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 2016-07-23 16:40:02 +02:00
Bob Weinand
6046acf93e Fix ClosedGeneratorException possibly thrown into wrong scope 2016-07-23 16:39:21 +02:00
Nikita Popov
696d6e7c90 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 13:30:55 +02:00
Nikita Popov
f12fd5c2d3 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/standard/ftp_fopen_wrapper.c
 2016-07-23 13:29:57 +02:00
vhuk
65abdb556d Fix for bug #54431 2016-07-23 13:28:42 +02:00
Nikita Popov
f4d1af7981 Fix build 
Missed this occurrence...
 2016-07-23 00:12:11 +02:00
Nikita Popov
07af6ba898 Make sure TOKEN_PARSE mode is thread safe 
Introduce an on_event_context passed to the on_event hook. Use this
context to pass along the token array. Previously this was stored
in a non-tls global :/
 2016-07-23 00:00:13 +02:00
Nikita Popov
40b312d4c2 Use OPENSSL_RAW_DATA in raw data decryption tests 2016-07-22 18:30:30 +02:00
Nikita Popov
bb51da29dc Make base64_decode() in non-strict mode binary safe 2016-07-22 18:20:34 +02:00
Nikita Popov
e1216f6fc1 Add NEWS entries 2016-07-22 18:07:45 +02:00
Lauri Kenttä
cab5f6a889 base64_decode: Add tests 2016-07-22 18:03:56 +02:00
Lauri Kenttä
316d5a19a6 base64_decode: Handle all invalid padding equally 2016-07-22 18:03:56 +02:00
Lauri Kenttä
5c62f3f68e base64_decode: strict: Fail on excessive padding 2016-07-22 18:03:56 +02:00
Lauri Kenttä
586a0761ff base64_decode: strict: Fail on truncated input 2016-07-22 18:03:56 +02:00
Lauri Kenttä
0981e5de3c base64_decode: Avoid code duplication in failures 2016-07-22 18:03:55 +02:00
Lauri Kenttä
7a02704c0e Require strict base64 in data URI 
As the tests already show, the data URI wrapper is supposed to fail
for corrupt input, but for some reason, one case of invalid input is
still allowed to pass?! Strict base64 makes a lot more sense here.
Also, Chromium and Firefox fail on invalid base64, so it's a logical
choice for PHP as well.
 2016-07-22 18:03:55 +02:00
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
eaa8f49708 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:15:24 +08: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
05dfd1d39f Update NEWs 2016-07-22 23:14:51 +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
Remi Collet
d5ad4b8b14 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  FPM: add test for CVE-2016-5385
 2016-07-22 09:37:00 +02:00
Remi Collet
9622f973a5 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  FPM: add test for CVE-2016-5385
 2016-07-22 09:36:36 +02:00
Remi Collet
fb4a6dc0f1 FPM: add test for CVE-2016-5385 2016-07-22 09:35:09 +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
Christoph M. Becker
4c5aa9ba2c Merge branch 'PHP-7.0' into PHP-7.1 2016-07-21 16:51:19 +02:00
Christoph M. Becker
7e2c3a77c0 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-21 16:50:37 +02:00