php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 20:22:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
97,296 Commits 547 Branches 1,481 Tags
dc6ea028b5dce01c314afbb2bb628cf44e070b0c
Commit Graph

42351 Commits

Author SHA1 Message Date
Jakub Zelenka
dc6ea028b5 Fix indent in opnenssl_decrypt tests 2016-07-24 13:40:54 +01:00
Xinchen Hui
e06331931d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #72661 (ReflectionType::__toString crashes with iterable)
 2016-07-24 11:01:34 +08:00
Xinchen Hui
a3a797dbd5 Fixed bug #72661 (ReflectionType::__toString crashes with iterable) 2016-07-24 11:01:19 +08:00
Nikita Popov
8af431a790 Merge branch 'PHP-7.1' 2016-07-24 00:18:57 +02:00
Nikita Popov
ca64223193 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-24 00:18:51 +02:00
Nikita Popov
aecc435482 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-24 00:18:47 +02:00
Nikita Popov
04b42b1e05 More tolerance in another IntlCalendar test 
Again, off-by-1000 is expected if we're late in the second. Add an
extra 1000 to account for actual delta in call times.
 2016-07-24 00:15:14 +02:00
Nikita Popov
ade99115ca Merge branch 'PHP-7.1' 2016-07-24 00:08:42 +02:00
Nikita Popov
42e995e0d3 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-24 00:08:18 +02:00
Nikita Popov
2194690625 Ensure session GC is not run during variation6.phpt 
The implemented gc() handler simply deletes all sessions, including
the current one. This may cause a subsequent unlink() warning.
Avoid this by preventing GC from running.
 2016-07-24 00:07:54 +02:00
Nikita Popov
307e4bfca1 Merge branch 'PHP-7.1' 2016-07-23 23:14:40 +02:00
Sjon Hortensius
66626cc223 Fix typos, previous version used reserver/reserverd/reserved 2016-07-23 23:14:14 +02:00
Anatol Belski
7964c5c060 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #72625 realpath() fails on non canonical long path
  correct comment
  don't return long path prefix to script
 2016-07-23 21:31:36 +02:00
Anatol Belski
0f16c56262 Fixed bug #72625 realpath() fails on non canonical long path 2016-07-23 21:11:27 +02:00
Anatol Belski
99bc1407c8 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test
  fix test
 2016-07-23 21:06:46 +02:00
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
cbb4e424e8 Merge branch 'PHP-7.1' 2016-07-23 19:46:19 +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
95a87c3f82 Merge branch 'PHP-7.1' 2016-07-23 18:13:59 +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
e13abc1fd7 Merge branch 'PHP-7.1' 2016-07-23 17:05:30 +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
Mark Jones
e63ceacfca Remove unused DEFAULT_KEY_LENGTH define 2016-07-23 16:04:55 +02:00
Nikita Popov
3bfea88ad8 Merge branch 'PHP-7.1' 2016-07-23 13:31:04 +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
54414dab33 Merge branch 'PHP-7.1' 2016-07-23 00:05:25 +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
Andrey Hristov
671d22f5de Fix for bug #71863 Segfault when EXPLAIN with "Unknown column" error 
The reason was that after the big refactoring of mysqlnd at the end of
last year code that is initializing the error_info structure in the
result set was not added. It existed already for connections and PS.
The code that segfaults is hit only with MariaDB because MariaDB sends
full metadata about the EXPLAIN query + EOF packet and only then it sends
an error packet. MySQL doesn't do that but sends directly an error which
is caught (by different code path). As errors during execution (which means
after sending meta) are pretty rare there was no test case of MySQL to
catch it.
 2016-07-23 00:26:26 +03: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
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