clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
104,203 Commits 491 Branches 1,363 Tags 839 MiB
a3da46b524
Commit Graph

46349 Commits

Author SHA1 Message Date
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
abbdbc21b0 Fixed bug #75357 (segfault loading WordPress wp-admin) 2017-10-14 23:12:29 +08: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
Bob Weinand
f8ff4c4918 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-12 12:31:20 +02:00
Bob Weinand
a55af1e271 Fixed bug #75363 (openssl_x509_parse leaks memory) 2017-10-12 12:30:20 +02:00
Anatol Belski
81473829d4 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  It looks like i should've taken joint response on ext/fileinfo long ago
 2017-10-11 22:25:27 +02:00
Anatol Belski
677cd85cb7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  It looks like i should've taken joint response on ext/fileinfo long ago
 2017-10-11 22:24:52 +02:00
Anatol Belski
23e97b0222 It looks like i should've taken joint response on ext/fileinfo long ago 2017-10-11 22:21:34 +02:00
Anatol Belski
747f70ba82 Cleanup irrelevant info 2017-10-11 18:40:16 +02:00
Anatol Belski
08d8623dec Upgrade bundled libmagic to 5.31 2017-10-11 18:18:55 +02:00
Christoph M. Becker
1f150fcde1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
 2017-10-11 17:30:45 +02:00
Christoph M. Becker
d3d23e0cb8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
 2017-10-11 17:29:36 +02:00
Christoph M. Becker
787bf7eaf7 Merge branch 'pull-request/2798' into PHP-7.0 
* pull-request/2798:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
 2017-10-11 17:28:30 +02:00
Christoph M. Becker
50bd4996fd Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Use PHP_VERSION for exif
 2017-10-11 14:44:43 +02:00
Christoph M. Becker
62098a10aa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use PHP_VERSION for exif
 2017-10-11 14:43:51 +02:00
Christoph M. Becker
b497b6edf9 Merge branch 'pull-request/2799' into PHP-7.0 
* pull-request/2799:
  Use PHP_VERSION for exif
 2017-10-11 14:42:46 +02:00
Dmitry Stogov
2929110ce1 Fixed cleanup after optimization passes 2017-10-10 19:25:51 +03:00
Anatol Belski
ad279bd180 Fix path in makefile fragment 2017-10-10 14:32:19 +02:00
Anatol Belski
611d117b24 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix array access on undeclared properties in DateInterval
 2017-10-09 15:38:37 +02:00
Anatol Belski
d8881f4eb4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix array access on undeclared properties in DateInterval
 2017-10-09 15:38:21 +02:00
Anatol Belski
f48abfa902 Fix array access on undeclared properties in DateInterval 2017-10-09 15:35:38 +02:00
Sara Golemon
1db7e4a962 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
 2017-10-07 10:14:03 -04:00
Sara Golemon
ac1fd769ad Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
 2017-10-07 10:13:54 -04:00
Sara Golemon
843e492c68
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS 2017-10-07 10:08:34 -04:00
Rasmus Lerdorf
ec3ea3081d Add line numbers to Optimizer debug output 2017-10-06 17:18:58 -03:00
Christoph M. Becker
d0146c2506 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
 2017-10-06 16:57:20 +02:00
Christoph M. Becker
0f55138533 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
 2017-10-06 16:46:51 +02:00
Christoph M. Becker
ec3d864784 Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional) 
Of course, reflection has to know that as well.
 2017-10-06 16:45:07 +02:00
Peter Kokot
74124de048 Use PHP_VERSION for exif 2017-10-04 23:25:36 +02:00
Dmitry Stogov
e9426cf816 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed rarely possible use-after-free
 2017-10-04 16:39:47 +03:00
Dmitry Stogov
b6e34eaf04 Fixed rarely possible use-after-free 2017-10-04 16:38:55 +03:00
Dmitry Stogov
c3bb81d5a4 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
 2017-10-04 09:59:27 +03:00
Dmitry Stogov
c935b832dc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
 2017-10-04 09:58:32 +03:00
Dmitry Stogov
1195de87ff Bumped ext/oci8 version 2017-10-04 09:56:25 +03:00
Dmitry Stogov
ee50fcfa27 Merge branch 'oci8_fix' into PHP-7.0 
* oci8_fix:
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
 2017-10-04 09:49:40 +03:00
Dmitry Stogov
24e595bf26 Use dereferenced value 2017-10-03 10:49:56 +03:00