clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
104,228 Commits 491 Branches 1,363 Tags 841 MiB
5315cea6e2
Commit Graph

104228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
5315cea6e2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Backport 7ff13badda into 7.0+
 2017-10-18 16:27:31 +02:00
Anatol Belski
53d8775015 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Backport 7ff13badda into 7.0+
 2017-10-18 16:24:23 +02:00
Anatol Belski
d82805f097 Backport 7ff13badda into 7.0+ 2017-10-18 16:02:56 +02:00
Anatol Belski
63a0ddb013 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  One more folder to delete in AppVeyor image
 2017-10-17 15:37:23 +02:00
Anatol Belski
b9b06c4bdf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  One more folder to delete in AppVeyor image
 2017-10-17 15:34:42 +02:00
Anatol Belski
9891f11f84 One more folder to delete in AppVeyor image 2017-10-17 15:32:47 +02:00
Xinchen Hui
e53a9aaa4a Fixed bug (assertion fails with extended info generated) 2017-10-17 19:47:29 +08:00
Xinchen Hui
0292456262 Fixed test 2017-10-17 12:20:43 +08:00
Xinchen Hui
2f73f2436a Try to fix test 2017-10-17 11:35:40 +08:00
Tianfang Yang
77ad860bf0 Merge branch 'PHP-7.1' into PHP-7.2 2017-10-16 19:27:21 -04:00
Tianfang Yang
d1f43b1a58 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-16 19:24:08 -04:00
Tianfang Yang
f955cff54c Fixed valgrind issue 2017-10-16 19:20:24 -04:00
Tianfang Yang
aad4544e95 Fixed valgrind issue 2017-10-16 19:16:30 -04:00
Anatol Belski
d30477f23a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Move to next binary SDK version for AppVeyor
 2017-10-16 18:07:41 +02:00
Anatol Belski
c3177f8279 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Move to next binary SDK version for AppVeyor
 2017-10-16 18:06:38 +02:00
Anatol Belski
7778106f40 Move to next binary SDK version for AppVeyor 2017-10-16 18:05:56 +02:00
Dmitry Stogov
5d6912d185 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
 2017-10-16 19:02:22 +03:00
Dmitry Stogov
c33ca443ee Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
 2017-10-16 19:02:07 +03:00
Dmitry Stogov
8bfe748fb0 Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql 2017-10-16 19:00:12 +03:00
Xinchen Hui
6fab62e923 Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2 
* 'PHP-7.2' of git.php.net:/php-src:
  [ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")
  Properly fix #75363 and address some other leaks with cert
 2017-10-16 19:07:55 +08:00
Xinchen Hui
863acd7753 Fixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change $position argument) 2017-10-16 19:07:34 +08:00
Christoph M. Becker
08c04c9245 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")
 2017-10-16 11:12:17 +02:00
Christoph M. Becker
200d526a9c [ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct") 2017-10-16 11:11:34 +02:00
Jakub Zelenka
532aec7af2 Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2 2017-10-16 09:54:03 +01:00
Xinchen Hui
8e147f12b9 Fixed bug (Phi sources removel) 2017-10-16 15:01:06 +08:00
Jakub Zelenka
a3da46b524 Merge branch 'PHP-7.1' into PHP-7.2 2017-10-15 20:33:22 +01:00
Jakub Zelenka
547fee9cd4 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-15 20:31:25 +01:00
Jakub Zelenka
999fe36d40 Properly fix #75363 and address some other leaks with cert 2017-10-15 20:25:58 +01:00
Jakub Zelenka
7c556c44a1 Fix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key) 2017-10-15 19:36:15 +01:00
Christoph M. Becker
46d87c1f10 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)
 2017-10-15 14:07:41 +02:00
Christoph M. Becker
5e2751e7ff Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)
 2017-10-15 14:02:31 +02:00
Jelle van der Waa
5acb8381b2 Fixed bug #53070 (enchant_broker_get_path crashes if no path is set) 
enchant_broker_get_dict_path segfaults when the dict path is not setup,
instead of segfaulting return false instead.
 2017-10-15 13:57:44 +02:00
Christoph M. Becker
de5f15ed4e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75365 (Enchant still reports version 1.1.0)
 2017-10-15 13:35:59 +02:00
Christoph M. Becker
fd993b1045 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75365 (Enchant still reports version 1.1.0)
 2017-10-15 13:30:06 +02:00
Christoph M. Becker
fb09021432 Fixed bug #75365 (Enchant still reports version 1.1.0) 
Since Enchant is bundled, we make `PHP_ENCHANT_VERSION` an alias of
`PHP_VERSION` and also drop the rather meaningless revision hash from
the PHP info.
 2017-10-15 13:19:17 +02:00
Xinchen Hui
481a65a028 Update NEWS 2017-10-15 10:29:40 +08:00
Xinchen Hui
9f5ed133b3 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
 2017-10-15 10:29:28 +08:00
Xinchen Hui
b9b2ae703c Update NEWS 2017-10-15 10:29:10 +08:00
Xinchen Hui
49702ad7fb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
 2017-10-15 10:28:46 +08:00
Xinchen Hui
816758eda2 Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function) 2017-10-15 10:28:28 +08:00
Xinchen Hui
abbdbc21b0 Fixed bug #75357 (segfault loading WordPress wp-admin) 2017-10-14 23:12:29 +08:00
Dmitry Stogov
7045362ce7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)
 2017-10-13 14:00:21 +03:00
Dmitry Stogov
bf1c1d07db Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)
 2017-10-13 13:56:23 +03:00
Dmitry Stogov
397f5cb687 Fixed bug #75368 (mmap/munmap trashing on unlucky allocations) 2017-10-13 13:56:06 +03:00
Xinchen Hui
21f049b45c Prevent from being affected by local php.ini 2017-10-13 18:23:56 +08:00
Xinchen Hui
a52d1088e5 Added skipf 2017-10-13 18:21:41 +08:00
Xinchen Hui
e4f7ff9c0f Fixed bug #75370 (Webserver hangs on valid PHP text) 2017-10-13 18:18:10 +08:00
Xinchen Hui
e50cc4d3af Fixed typo 2017-10-13 17:35:02 +08:00
Christoph M. Becker
3f8961dfac Fixed bug #75221 (Argon2i always throws NUL at the end) 
Apparently, `argon2_encodedlen()` also counts the terminating NUL byte;
that doesn't appear to be documented somewhere, but from looking at the
implementation[1] it is pretty obvious.  Therefore, the respective
`zend_string` has to be one byte shorter.

[1] <https://github.com/P-H-C/phc-winner-argon2/blob/20161029/src/argon2.c#L431-L436>
 2017-10-12 12:52:37 +02:00
Bob Weinand
ee36507423 Merge branch 'PHP-7.1' into PHP-7.2 2017-10-12 12:32:30 +02:00