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,688 Commits 491 Branches 1,363 Tags 839 MiB
11eed9f3ba
Commit Graph

46592 Commits

Author SHA1 Message Date
Anatol Belski
3d55910f35 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Further test fixes for ICU >= 58
 2017-10-20 18:40:26 +02:00
Anatol Belski
e02c41fc72 Further test fixes for ICU >= 58 2017-10-20 18:39:46 +02:00
Anatol Belski
7027a1643f Version checks 2017-10-20 18:26:14 +02:00
Anatol Belski
fb88cee0fc Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Yet two wrong version checks
 2017-10-20 16:55:32 +02:00
Anatol Belski
65d4bd0311 Yet two wrong version checks 2017-10-20 16:54:47 +02:00
Anatol Belski
0f7ddf0d47 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix version checks in tests
  Fix version checks in tests
 2017-10-20 15:25:27 +02:00
Anatol Belski
ae6d877f54 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix version checks in tests
 2017-10-20 15:25:01 +02:00
Anatol Belski
2f444640b4 Fix version checks in tests 2017-10-20 15:24:43 +02:00
Anatol Belski
7240d99838 Fix version checks in tests 2017-10-20 15:23:09 +02:00
Anatol Belski
7775f9e872 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync some tests for compat with ICU 58.1, PHP 7.1+ part
  Sync some tests for compat with ICU 58.1+
 2017-10-20 13:58:53 +02:00
Anatol Belski
e2afa00b4c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Sync some tests for compat with ICU 58.1+
 2017-10-20 13:57:44 +02:00
Anatol Belski
26473523b0 Sync some tests for compat with ICU 58.1, PHP 7.1+ part 2017-10-20 13:56:58 +02:00
Anatol Belski
877e0b04bc Sync some tests for compat with ICU 58.1+ 2017-10-20 13:55:32 +02:00
Anatol Belski
2a361b14ea Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add skip for incompatible ICU version
 2017-10-20 11:30:09 +02:00
Anatol Belski
7751ae59ae Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add skip for incompatible ICU version
 2017-10-20 11:28:51 +02:00
Anatol Belski
9071ff5c87 Add skip for incompatible ICU version 2017-10-20 11:27:54 +02:00
Joe Watkins
4b67943501
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
 2017-10-19 12:03:19 +01:00
Joe Watkins
8eee20d876
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
 2017-10-19 12:02:52 +01:00
Nester
80c3b078b8
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination 2017-10-19 12:02:22 +01:00
Joe Watkins
925d969f9e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Escape newline on curl config.m4
 2017-10-19 11:40:05 +01:00
Ryan Volz
4e85dd0346
Escape newline on curl config.m4 2017-10-19 11:39:54 +01:00
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
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
aad4544e95 Fixed valgrind issue 2017-10-16 19:16:30 -04: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
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
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
Dmitry Stogov
4d69587035 Fixed compilation errors 2017-10-03 09:08:28 +03:00
Remi Collet
d67873ec99 Fix Bug #75284 sha3 is not supported on bigendian machine 2017-10-03 06:41:46 +02:00
Frank Denis
9d236d63f9 ext/sodium: untab tests 2017-10-02 22:28:46 +02:00
Frank Denis
1dc47286d1 ext/sodium: import secretstream test 2017-10-02 22:28:33 +02:00
Frank Denis
6de12a5f1e ext/sodium: sodium_compare() is always available 2017-10-02 22:23:53 +02:00
Frank Denis
40ab4c9d4e ext/sodium: fix funky indentation 2017-10-02 22:22:22 +02:00
Frank Denis
7fc396c15d ext/sodium: move pwhash_scrypt() after pwhash() 2017-10-02 22:19:55 +02:00
Frank Denis
986a9e879a ext/sodium: checks for crypto_box_SEALBYTES are not required 2017-10-02 22:11:29 +02:00
Frank Denis
4d1707b764 ext/sodium: explicitly include <string.h> 2017-10-02 22:10:30 +02:00
Frank Denis
0726d0be9f ext/sodium: zend_parse_parameters -> zend_parse_parameters_throw 2017-10-02 22:05:59 +02:00
Frank Denis
e4917d141a ext/sodium: fix funky indent on zend_parse_parameters_throw() calls 2017-10-02 22:02:47 +02:00
Frank Denis
72f7d0b184 ext/sodium: import bindings for secretstream 2017-10-02 21:59:51 +02:00
Frank Denis
7d53e65125 ext/sodium: add crypto_pwhash_str_needs_rehash() 
Also properly define xchacha20poly1305_ietf_keygen()
 2017-10-02 21:54:50 +02:00
Frank Denis
e22094eb13 ext/sodium: +base64 codecs (timing-safe) 2017-10-02 21:43:54 +02:00
Frank Denis
ad120c5ae9 ext/sodium: add arginfo definitions that will be required later 
Don't check for existence of aesgcm symbols, since we only support
libsodium >= 1.0.8
 2017-10-02 21:40:38 +02:00
Frank Denis
519ca1d53b ext/sodium: sort prototypes 2017-10-02 21:36:35 +02:00
Dmitry Stogov
c8dea7ae1e Restored code for BOOL variables 2017-10-02 17:04:26 +03:00
Remi Collet
fa78afa112 Fixed bug #75303 sha3 hangs on bigendian 2017-10-02 11:25:23 +02:00
Sara Golemon
ec90310ea9 Guard against AI_NUMERICSERV not being defined. 2017-10-01 21:37:04 -04:00
Frank Denis
0663ca135d ext/sodium: fix pwhash_argon2i test 2017-10-01 16:00:41 +02:00
Fabien Villepinte
9d9873b3b5 Fix Bug #75299 Wrong reflection on inflate_init and inflate_add 2017-10-01 11:27:16 +02:00
Xinchen Hui
92ceb64faf Merge branch 'patch-compile-warning' of https://github.com/petk/php-src into PHP-7.2 
* 'patch-compile-warning' of https://github.com/petk/php-src:
  Fix bug #75279
 2017-09-30 12:14:21 +08:00
Remi Collet
7c8357929c Fixed bug #75285i Broken build when system libpcre don't have jit support 
Detect JIT support in system library,
So --with-pcre-jit is only for bundled library.
 2017-09-29 15:47:50 +02:00
Peter Kokot
8d87f6f6dd Fix bug #75279 2017-09-29 14:33:54 +02:00
Anatol Belski
c3a1cc382a Revert --with-pcre-valgrind by default in debug build 
After quite a few people reported this option enabled to be in many cases
not handy by default, it's reverted to no by default everywhere. If enabled,
it requires Valgrind dev packages, where just a few have Valgrind itself
installed or care. Still for PCRE related work this option is a must,
though will have to be turned on by hand.

Revert "fix default args for --with-pcre-valgrind"

This reverts commit 24de0fe9f4.

Revert "Enable valgrind support for PCRE by default in debug builds"

This reverts commit 850bb998d9.
 2017-09-29 12:17:38 +02:00
Xinchen Hui
d3aa65231e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75267 (possible &/&& mixup)
 2017-09-29 11:17:07 +08:00
Xinchen Hui
9fd33c1f20 Fixed bug #75267 (possible &/&& mixup) 2017-09-29 11:16:32 +08:00
Anatol Belski
4f1ea03528 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Apply upstream patch for CVE-2016-1283
 2017-09-28 15:45:09 +02:00
Anatol Belski
db9778dfb2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Apply upstream patch for CVE-2016-1283
 2017-09-28 15:44:40 +02:00
Anatol Belski
d11fceab15 Apply upstream patch for CVE-2016-1283 
Fix bug #75207, see also
https://bugzilla.redhat.com/show_bug.cgi?id=1295385
https://vcs.pcre.org/pcre?view=revision&revision=1636
 2017-09-28 15:40:49 +02:00
Anatol Belski
4f63024206 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix mkdir() special case for path length < 260 and > 248
 2017-09-28 13:19:48 +02:00
Anatol Belski
72c008f945 Fix mkdir() special case for path length < 260 and > 248 2017-09-28 13:18:31 +02:00
Dmitry Stogov
978c6c4e31 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75255 (Request hangs and not finish)
 2017-09-27 17:17:46 +03:00
Dmitry Stogov
1c68d63f35 Fixed bug #75255 (Request hangs and not finish) 2017-09-27 17:16:24 +03:00
jhdxr
7deb561f75
fix bug #75222 DateInterval microseconds property always 0 2017-09-27 06:23:42 +01:00
Joe Watkins
0d6c56a8ea
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed #75220 - Segfault when calling is_callable on parent
 2017-09-27 06:08:49 +01:00
Joe Watkins
2dd77456fe
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #75220 - Segfault when calling is_callable on parent
 2017-09-27 06:08:01 +01:00
Nester
a680d701ce
Fixed #75220 - Segfault when calling is_callable on parent 2017-09-27 06:07:24 +01:00
Frank Denis
33b4405d84 ext/sodium: call crypto_pwhash_argon2id() explicitly if required 2017-09-26 18:09:00 +02:00
Frank Denis
47d75394c9 ext/sodium: avoid tautological comparisons 2017-09-26 17:58:16 +02:00
Frank Denis
f64d00d684 ext/sodium: signing empty messages is fine 2017-09-26 17:37:04 +02:00
Nikita Popov
3a4db74ee4 Create $http_response_header even if not used 
Extensions are relying on it.
 2017-09-26 09:20:43 +02:00
Christoph M. Becker
296eb5193c Merge branch 'pull-request/2773' into PHP-7.2 
* pull-request/2773:
  Fix PHP_GD_TTSTR: command not found warning in ext/gd
 2017-09-26 00:45:21 +02:00
Dmitry Stogov
2a33e357cd Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Added missed ~
 2017-09-25 12:23:01 +03:00
Dmitry Stogov
550595c085 Added missed ~ 2017-09-25 12:22:35 +03:00
Dmitry Stogov
801cdb8945 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed type inference
 2017-09-25 12:04:13 +03:00
Dmitry Stogov
d526ddec85 Fixed type inference 2017-09-25 12:03:47 +03:00
Peter Kokot
8c85d7b732 Fix PHP_GD_TTSTR: command not found warning in ext/gd 2017-09-25 02:37:42 +02:00
Xinchen Hui
ed2a5ebaeb Fixed bug #75230 (Invalid opcode 49/1/8 using opcache) 2017-09-24 18:01:29 +08:00
Xinchen Hui
bad5639386 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning
 2017-09-24 17:24:57 +08:00
Xinchen Hui
e8c200515a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning
 2017-09-24 17:24:23 +08:00
Xinchen Hui
db63367871 Compiler warning 2017-09-24 17:19:05 +08:00
Dmitry Stogov
28391b9e7f Using "enum" types as bit-fields is not portable. 2017-09-22 13:35:41 +03:00
Frank Denis
8a52a61e3a ext/sodium: avoid negations on unsigned values 2017-09-21 17:46:01 +02:00
Christoph M. Becker
43152bc39f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags)
 2017-09-20 15:54:07 +02:00
Christoph M. Becker
0c0b955d5f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags)
 2017-09-20 15:47:02 +02:00
Dmitry Stogov
9a01fe712a Fixed few ext/oci8 bugs 2017-09-20 16:46:04 +03:00
Christoph M. Becker
eedc060c92 Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags) 
We must not overwrite the SPL_DLLIST_IT_FIX flag when changing the
iterator mode.
 2017-09-20 15:46:04 +02:00
Dmitry Stogov
6544ec5460 Fixed NOP removal (empty blocks should be shifted as well) 2017-09-20 01:10:31 +03:00
Frank Denis
fd86fdd7b8 ext/sodium: throw an exception if only the prefix of a hex string is valid 2017-09-19 14:37:21 +02:00
Dmitry Stogov
084e34098a Fixed optimization (the bug caused endless-loop on micro_bench.php in master branch) 2017-09-18 14:10:18 +03:00
Anatol Belski
b134793b32 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75018, fixed bug #75177
 2017-09-13 14:12:31 +02:00
Anatol Belski
3d93856c4a Fixed bug #75018, fixed bug #75177 
Both are caused by the same cast issue in mysqlnd on 32-bit.
 2017-09-13 14:10:30 +02:00
Dmitry Stogov
2874fa8fb0 Fixed test 2017-09-12 23:47:22 +03:00
Anatol Belski
689f9956da Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test failure on 32-bit
 2017-09-12 18:19:34 +02:00
Anatol Belski
fcad6a97b8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test failure on 32-bit
 2017-09-12 18:18:44 +02:00
Anatol Belski
7674b5e574 Fix test failure on 32-bit 2017-09-12 18:17:28 +02:00
Anatol Belski
a54079b92f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75193 segfault in collator_convert_object_to_string
 2017-09-12 12:14:24 +02:00
Anatol Belski
05c65de082 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75193 segfault in collator_convert_object_to_string
 2017-09-12 12:13:42 +02:00
Remi Collet
b09497c0e2 Fixed bug #75193 segfault in collator_convert_object_to_string 2017-09-12 12:12:06 +02:00
Joe Watkins
f87e513557
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop
 2017-09-12 07:08:01 +01:00
Joe Watkins
7015d22116
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop
 2017-09-12 07:06:35 +01:00
jhdxr
3e11b7fc21
fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop 2017-09-12 07:05:58 +01:00
Dylan K. Taylor
c3b0e68eb7
Fix LDFLAGS getting overwritten (ext/curl) 2017-09-12 07:03:22 +01:00
Christoph M. Becker
77f3cef35c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #46781 (BC math handles minus zero incorrectly)
 2017-09-11 23:52:14 +02:00
Christoph M. Becker
87a91aef83 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #46781 (BC math handles minus zero incorrectly)
 2017-09-11 23:46:21 +02:00
Christoph M. Becker
9aa6898b9b Fixed bug #46781 (BC math handles minus zero incorrectly) 
Actually, there is no negative zero at all.  We obey Postel's law, and
still accept negative zeroes, but we store them as positive zeroes
after the conversion from string, i.e. we normalize before further
processing.
 2017-09-11 23:44:23 +02:00
Anatol Belski
dcae6d6423 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fork test to keep up with libxsl >= 1.1.30
 2017-09-11 18:20:42 +02:00
Anatol Belski
88c7556d99 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fork test to keep up with libxsl >= 1.1.30
 2017-09-11 18:20:13 +02:00
Anatol Belski
d103802003 Fork test to keep up with libxsl >= 1.1.30 
The behavior of date parsing has changed and is reflected in the
changelog. Invalid dates are not accepted, in particular dates with a
negative year, as in this test.
 2017-09-11 18:14:51 +02:00
Anatol Belski
2d60b35147 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add symbol to libxml exports
 2017-09-11 17:37:10 +02:00
Anatol Belski
75cb69740e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add symbol to libxml exports
 2017-09-11 17:36:25 +02:00
Anatol Belski
04a6bbae6c Add symbol to libxml exports 2017-09-11 17:35:25 +02:00
Anatol Belski
8a9ff55397 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test compat with libxml2 2.9.5
 2017-09-11 16:16:09 +02:00
Anatol Belski
a77eddff96 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test compat with libxml2 2.9.5
 2017-09-11 16:15:32 +02:00
Anatol Belski
cab41ecb93 Fix test compat with libxml2 2.9.5 
One warning disappeared, but the flow is still valid.
 2017-09-11 16:12:04 +02:00
Anatol Belski
45613b3473 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test compat with libxml2 2.9.5
 2017-09-11 14:35:51 +02:00
Anatol Belski
b5d7663444 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test compat with libxml2 2.9.5
 2017-09-11 14:35:24 +02:00
Anatol Belski
3549d9184a Fix test compat with libxml2 2.9.5 
From 2.9.5 on libxml explcitly initializes the keepBlanks flag.
 2017-09-11 14:32:54 +02:00
Anatol Belski
2f5129cacb Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test portability
 2017-09-11 12:40:11 +02:00
Anatol Belski
d33194d2aa Fix test portability 
The message comes from the C runtime, so it is not reliable to check the
exact wording.
 2017-09-11 12:38:20 +02:00
Anatol Belski
a6bbb534d5 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test compatibility with libxml2 2.9.5
 2017-09-11 12:18:37 +02:00
Anatol Belski
9ca0cd0a1a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test compatibility with libxml2 2.9.5
 2017-09-11 12:18:06 +02:00
Anatol Belski
5f9ae45e22 Fix test compatibility with libxml2 2.9.5 2017-09-11 12:12:19 +02:00
Xinchen Hui
82d4727dbb Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75152 (signed integer overflow in parse_iv)

Conflicts:
	ext/standard/var_unserializer.c
 2017-09-11 12:47:47 +08:00
Xinchen Hui
822c13b9ef Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Fixed bug #73730 (textdomain(null) throws in strict mode)
  Fix bug75178.phpt on Windows
  Fixed bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
  Add BC define for users of the typoed zend_symbtable_add_new
  Fix typo in zend_symtable_add_new() API name
  Fixed bug #54598 (bcpowmod() may return 1 if modulus is 1)
  Fixed bug #44995 (bcpowmod() fails if scale != 0)
  Add missing null termination
  Fixed bug #70470
  Add test for bug #75155
  Revert "Fixed #74977 - Appending AppendIterator leads to segfault"
 2017-09-11 12:46:26 +08:00
Xinchen Hui
6b2813c3a7 Fixed bug #75152 (signed integer overflow in parse_iv) 2017-09-11 12:46:11 +08:00
Christoph M. Becker
674fe0af38 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #73730 (textdomain(null) throws in strict mode)
 2017-09-10 18:47:16 +02:00
Christoph M. Becker
b394343a31 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73730 (textdomain(null) throws in strict mode)
 2017-09-10 18:41:00 +02:00
Christoph M. Becker
4b746fce1c Fixed bug #73730 (textdomain(null) throws in strict mode) 
The $text_domain parameter may be NULL, which we have to cater to
explicitly with regard to strict_types.
 2017-09-10 18:39:29 +02:00
Christoph M. Becker
20fe838c76 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug75178.phpt on Windows
 2017-09-09 17:04:42 +02:00
Christoph M. Becker
6602cc0385 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug75178.phpt on Windows
 2017-09-09 16:54:23 +02:00
Christoph M. Becker
3fd08a1595 Fix bug75178.phpt on Windows 
bug75178.phpt fails on Windows, because the stderr output is not
interspersed with stdout output there, but rather is appended to the
end. The fix is analogous to bug72093.phpt.
 2017-09-09 16:46:32 +02:00
Christoph M. Becker
21eab49a53 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
 2017-09-09 13:30:40 +02:00
Christoph M. Becker
afa39038c2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
 2017-09-09 13:20:14 +02:00
Christoph M. Becker
44eec946e8 Fixed bug #75178 (bcpowmod() misbehaves for non-integer base or modulus) 
Since `bcpowmod()` does not support non-integral operands, we have to
truncate these in addition to emitting a respective warning. We also
have to work with the truncated values in the following.

We recognize that the division by one to enforce the truncation is
actually overkill, but we stick with it for now, and shall tackle the
issue for PHP 7.3.
 2017-09-09 13:18:26 +02:00
Sammy Kaye Powers
b786e1b45c Improve sodium "invalid parameters" error messages 2017-09-07 22:18:48 +02:00
Nikita Popov
fd07302024 Fixed bug #75170 
This change may result in different mt_rand/rand sequences being
generated on 64-bit systems for a specific seed.

See also https://externals.io/message/100229.
 2017-09-07 20:04:38 +02:00
Côme Chilliet
e67379399a Removing client controls attribute from ldap_exop signature 
Client controls will not get implemented in php-ldap as
 they are specific to each client ldap lib and most of the
 time unused any way. (servers controls on the other end are used
 and will get implemented)
 2017-09-07 16:31:03 +02:00
Dmitry Stogov
251a5599b4 Fixed SSA reconstruction 2017-09-07 17:10:38 +03:00
Christoph M. Becker
d01453b129 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #54598 (bcpowmod() may return 1 if modulus is 1)
 2017-09-07 00:38:59 +02:00
Christoph M. Becker
0f88a49fd5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #54598 (bcpowmod() may return 1 if modulus is 1)
 2017-09-07 00:32:39 +02:00
Christoph M. Becker
b2919853f8 Fixed bug #54598 (bcpowmod() may return 1 if modulus is 1) 
`x mod 1` is always zero; we have to take the scale into account,
though.
 2017-09-07 00:30:05 +02:00
Christoph M. Becker
5ce744091c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #44995 (bcpowmod() fails if scale != 0)
 2017-09-06 23:41:46 +02:00
Christoph M. Becker
d724d8c107 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #44995 (bcpowmod() fails if scale != 0)
 2017-09-06 23:33:48 +02:00
Christoph M. Becker
dea41f3c3a Fixed bug #44995 (bcpowmod() fails if scale != 0) 
`bc_divmod()` is supposed to do integer division, so we must not apply
a scale factor here.
 2017-09-06 23:30:53 +02:00
Nikita Popov
dc00b6cf3f Fix assertion failure in SoapFault ctor 
Resetting the IAP on a shared array violates COW. I'm replacing this
with code to look up indexes 0 and 1, even though this is not
strictly the same.
 2017-09-05 17:38:50 +02:00
Ken Guest
056df0dcb2 Add test for invalid SoapFault parameters 2017-09-05 17:36:01 +02:00
Sammy Kaye Powers
a8862d215c Fix a few places where ZPP throw got reverted to ZPP 2017-09-05 16:39:24 +02:00
Derick Rethans
c0383b5039 Upgrade timelib to 2017.05beta9 2017-09-04 22:45:34 +01:00
Nikita Popov
b2824629c2 Merge branch 'PHP-7.1' into PHP-7.2 2017-09-04 21:24:32 +02:00
Nikita Popov
c2e3541cc1 Add test for bug #75155 2017-09-04 21:23:07 +02:00
Nikita Popov
b689857d53 Revert "Fixed #74977 - Appending AppendIterator leads to segfault" 
This reverts commit dbc2ffba82.
 2017-09-04 21:20:49 +02:00
Dmitry Stogov
384da65a97 Fixed edge-case in SSA use/def chain construction and type inference. 2017-09-04 21:58:24 +03:00
Dmitry Stogov
b5935c339e Fixed tests 2017-09-04 20:12:17 +03:00
Remi Collet
a1bf36778a Fixed Bug #75149 redefinition of typedefs ttinfo and t1info 
Minimal fix from upstream
Better name for struct will come later
 2017-09-04 18:35:42 +02:00
Dmitry Stogov
ea734e2ac2 Fixed incorect constant conditional jump elimination 2017-09-04 19:11:17 +03:00
Dmitry Stogov
97b3cce755 Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2 
* 'PHP-7.2' of git.php.net:php-src:
  improve warn (bzip2 requires libzip >= 1.3.0)
  libzip 1.3.0 supports also bz2 compression
 2017-09-04 16:50:44 +03:00
Dmitry Stogov
eb21300a26 Revert "Fixed incorrect optimizaton (update of jump instructions should be also reflected in CFG update)" 
This reverts commit db5b8dbcdf.
 2017-09-04 16:50:12 +03:00
Remi Collet
5bbd459609 improve warn (bzip2 requires libzip >= 1.3.0) 2017-09-04 14:47:03 +02:00
Anatol Belski
b971087354 libzip 1.3.0 supports also bz2 compression 2017-09-04 13:27:53 +02:00
Dmitry Stogov
db5b8dbcdf Fixed incorrect optimizaton (update of jump instructions should be also reflected in CFG update) 2017-09-04 14:07:37 +03:00
Dmitry Stogov
ebb00c1e0f Fixed typo 2017-09-04 13:01:30 +03:00
Dmitry Stogov
4f1c2c22ca Prevent duplicate debug output 2017-09-04 12:58:40 +03:00
Christoph M. Becker
b4dc3de5ab Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?)
 2017-09-02 00:20:46 +02:00
Christoph M. Becker
afad9006c7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?)
 2017-09-02 00:11:36 +02:00
Christoph M. Becker
e20a6b0213 Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?) 
We back-port https://github.com/libgd/libgd/commit/dd48286 even though
we cannot come up with a regression test, because the erroneous
condition appears to be impossible to trigger.

We also parenthesize the inner ternary operation to avoid confusion.
 2017-09-02 00:04:02 +02:00
Anatol Belski
a6456f0a6c Fixed bug #75143 new method setEncryptionName() seems not to exist in ZipArchive 
update NEWS
 2017-09-01 10:53:09 +02:00
Remi Collet
1248e0f7f5 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  move AC_DEFINE in the right position (in bundled lib conditon)
 2017-08-31 07:56:13 +02:00
Remi Collet
bcf50b7261 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  move AC_DEFINE in the right position (in bundled lib conditon)
 2017-08-31 07:56:00 +02:00
Remi Collet
3239f6d679 move AC_DEFINE in the right position (in bundled lib conditon) 2017-08-31 07:55:45 +02:00
Jakub Zelenka
1f843a8fb5 Automatically load OpenSSL configuration file 2017-08-30 17:31:17 +01:00
Jakub Zelenka
58df6a3b61 Do not explicitly initialize and clean up OpenSSL for OpenSSL 1.1 2017-08-30 17:29:24 +01:00
Anatol Belski
752fc86f2b Fix symbol name 2017-08-30 01:11:19 +02:00
Frank Denis
04c87ea815 ext/sodium: the second parameter of sodium_hex2bin() is optional 2017-08-29 19:25:01 +02:00
Frank Denis
b1a7885dd7 ext/sodium: AI_StringRef_And_String -> AI_StringRefAndString for consistency 2017-08-29 19:23:22 +02:00
Frank Denis
6383c6e3d0 ext/sodium: sort functions list 2017-08-29 19:22:17 +02:00
Sammy Kaye Powers
56a999885a Fix constant references in error messages in ext/sodium 2017-08-28 22:16:35 -04:00
Christoph M. Becker
1aeafb7d4a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75124 (gdImageGrayScale() may produce colors)
 2017-08-27 14:07:55 +02:00
Christoph M. Becker
a9ff4d1f5a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75124 (gdImageGrayScale() may produce colors)
 2017-08-27 13:55:23 +02:00
Christoph M. Becker
499f5480f1 Fixed bug #75124 (gdImageGrayScale() may produce colors) 
We have to make sure to avoid alpha-blending issues by explicitly
switching to `gdEffectReplace` and to restore the old value afterwards.

This is a port of <https://github.com/libgd/libgd/commit/a7a7ece>.
 2017-08-27 13:53:39 +02:00
Remi Collet
cc577749a8 Improve pkg-config usage 
- use default path when run using --with-curl=/usr (for debian)
- fallback to headers search when libcurl.pc not found
- issue warnings for explanation
 2017-08-27 07:48:52 +02:00
Christoph M. Becker
3a2ad5b2c5 Update to SQLite 3.20.1 2017-08-26 12:13:06 +02:00
Nikita Popov
3ef8964997 Merge branch 'PHP-7.1' into PHP-7.2 2017-08-25 22:03:23 +02:00
Nikita Popov
52e854f0ab Merge branch 'PHP-7.0' into PHP-7.1 2017-08-25 22:03:00 +02:00
Thomas Punt
be9edd83c2 Fixed bug #75090 2017-08-25 22:02:19 +02:00
Remi Collet
b8c6ce91b2 Switch from curl-config to pkg-config for curl extension 
First attemp to fix multiarch support (#74125) for curl
introduce some debian specificity (dpkg command)
so is not suitable for other environmant.

This is mostly related to a broken "curl-config" config on debian
which doesn't provide the correct build options, while pkg-config
works as expected.

This new attemp rely on pkg-config output instead.

Notice: this make pkg-config a hard dependency.
Is there system without pkg-config ?
 2017-08-25 17:01:12 +02:00
Anatol Belski
a454e38b7c Enable PGO for Opcache 2017-08-24 23:36:21 +02:00
Frank Denis
48907e57ff sodium ext: if it's a length, call it "length"! 2017-08-24 16:17:41 +02:00
Frank Denis
3691f36913 sodium ext: add bindings for sodium_pad() and sodium_unpad() 2017-08-24 16:12:18 +02:00
Christoph M. Becker
5cd348c1d6 Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image) 
Crafted BMP images can cause dynamicSeek() to be called with a negative
position which must not be allowed, since dynamicSeek() works like
fseek() in SEEK_SET mode. We solve this by bailing out if `pos` is
negative, and let the image reading fail gracefully.
 2017-08-24 14:07:10 +02:00
Frank Denis
cf6f25bd37 sodium ext: restore sodium_remove_param_values_from_backtrace() call 2017-08-24 11:01:08 +02:00
Frank Denis
a966d21aa8 sodium ext: sync sodium_crypto_kdf_derive_from_key() with the standalone ext 
Use libsodium's native function if available, use correct constant names
in error messages
 2017-08-24 10:59:02 +02:00