clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
105,248 Commits 491 Branches 1,363 Tags 844 MiB
557edb75c0
Commit Graph

47061 Commits

Author SHA1 Message Date
Peter Kokot
8d587f09c0
Refactor ext/phar License info 2017-10-19 11:59:12 +01:00
Thiago Carvalho
4c97dc099c
Add tests to XMLReader::expand error paths 2017-10-19 11:55:31 +01:00
Peter Kokot
13f3bd9172
Convert some mysqlnd file encodings to UTF-8 2017-10-19 11:46:54 +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
f24e597c85 Constify key access for hash and formal params 
Keys created in shared memory and won't be modified and are free'd on
restart. Otherwise, keys passed to functions should not be modified,
too.
 2017-10-19 12:07:08 +02:00
Dmitry Stogov
272f5a1716 Extend zend_string API to avoid reallocation in zend_string_init_interned() 2017-10-19 00:02:56 +03:00
Dmitry Stogov
e87e62cc6f Moved ZCG(function_table) back into accel_acrivate. It should be unique per thread. 2017-10-18 18:26:30 +03: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
Dmitry Stogov
b4903aef16 Move a part of opcache initialization into post_startup phase (when all extensions already loaded). 2017-10-18 17:18:54 +03:00
Anatol Belski
d82805f097 Backport 7ff13badda into 7.0+ 2017-10-18 16:02:56 +02:00
Dmitry Stogov
7ff13badda Fixed required SHM memeory size calculation for scripts when opcache.revalidate_path is set. 2017-10-18 14:26:44 +03:00
Xinchen Hui
d042d1d8e0 Cleanup cfg flags & Added ZEND_FUNC_HAS_EXTENED_INFO 2017-10-18 17:03:07 +08:00
fandrieu
014fd21b48 Implemented request #69592: allow 0-column rowsets to be skipped automatically 
This adds a new attribute PDO::DBLIB_ATTR_SKIP_EMPTY_ROWSETS to enable automatic
skipping of empty rowsets.

This happens with some SQL commands (like PRINT or SET): a rowset with 0 columns
is returned by the driver.

With this option enabled, 0 columns rowsets are automatically skipped, mirroring
the behavior of the deprecated mssql extension.

Credits go to MiRacLe-RPZ for developping and promoting this patch.
 2017-10-17 14:16:38 -04:00
Xinchen Hui
21f2ed6a63 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug (assertion fails with extended info generated)
 2017-10-17 19:47:40 +08:00
Xinchen Hui
e53a9aaa4a Fixed bug (assertion fails with extended info generated) 2017-10-17 19:47:29 +08:00
Dmitry Stogov
61ef91bf0d Revert "Allow internal functions to return values by reference (this was disabled in implementation of DO_ICALL, but enabled in DO_FCALL)." 
This reverts commit da781a5ac2.
 2017-10-17 13:25:19 +03:00
Dmitry Stogov
da781a5ac2 Allow internal functions to return values by reference (this was disabled in implementation of DO_ICALL, but enabled in DO_FCALL). 
However, don't require internal functions returning by reference to return a reference.
Mark unserialize() as returning by reference and remove unwrap_reference hack, to allow proper returning of self referenced arrays using a reference.
Currently unserialize() is the only internal function that may return a reference.
 2017-10-17 11:50:34 +03:00
Xinchen Hui
3e195d4d16 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed test
 2017-10-17 12:20:48 +08:00
Xinchen Hui
0292456262 Fixed test 2017-10-17 12:20:43 +08:00
Xinchen Hui
1c7c5d9720 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Try to fix test
 2017-10-17 11:35:57 +08:00
Xinchen Hui
2f73f2436a Try to fix test 2017-10-17 11:35:40 +08:00
Tianfang Yang
28e6520574 Merge branch 'PHP-7.2' 2017-10-16 19:28:50 -04: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
1dd224dd12 Reuse interned strings from opcache SHM, if possible. 2017-10-16 19:20:16 +03:00
Dmitry Stogov
555f6dfdec Merge branch 'PHP-7.2' 
* PHP-7.2:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
 2017-10-16 19:02:46 +03: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
5c697ccb9d Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change $position argument)
 2017-10-16 19:09:13 +08: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
7bce8c5224 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug (Phi sources removel)
 2017-10-16 15:23:02 +08:00
Xinchen Hui
8e147f12b9 Fixed bug (Phi sources removel) 2017-10-16 15:01:06 +08:00
Jakub Zelenka
16aca56816 Merge branch 'PHP-7.2' 2017-10-15 20:33:49 +01: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
d1f5811ff0 Merge branch 'PHP-7.2' 2017-10-15 19:37:22 +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
Peter Kokot
b7b55d955e Remove PHP code examples from xmlwriter extension 
PHP documentation can present PHP code examples better instead.
 2017-10-15 15:38:45 +02:00
Christoph M. Becker
c189b4788d Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)
 2017-10-15 14:08:03 +02: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
b4c6637c0b Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75365 (Enchant still reports version 1.1.0)
 2017-10-15 13:36:25 +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
dc6aaf0c8c Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75357 (segfault loading WordPress wp-admin)
 2017-10-14 23:12:48 +08:00
Xinchen Hui
abbdbc21b0 Fixed bug #75357 (segfault loading WordPress wp-admin) 2017-10-14 23:12:29 +08:00
Dmitry Stogov
f26fc527da Fixed unzserialize(), to disable creation of unsupported data structures through manually crafted strings. (Dmitry) 2017-10-13 15:53:11 +03:00
Xinchen Hui
bc038206ad Merge branch 'PHP-7.2' 
* PHP-7.2:
  Prevent from being affected by local php.ini
  Added skipf
 2017-10-13 18:24:27 +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
f87a0b32c6 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75370 (Webserver hangs on valid PHP text)
  Fixed typo
 2017-10-13 18:19:19 +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
eb4342eb14 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75221 (Argon2i always throws NUL at the end)
 2017-10-12 12:52:58 +02: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
2392010af4 Merge branch 'PHP-7.2' 2017-10-12 12:32:49 +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
cc8a28fb18 Merge branch 'PHP-7.2' 
* PHP-7.2:
  It looks like i should've taken joint response on ext/fileinfo long ago
 2017-10-11 22:26:09 +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
bfe19cb355 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Cleanup irrelevant info
 2017-10-11 19:00:41 +02:00
Anatol Belski
747f70ba82 Cleanup irrelevant info 2017-10-11 18:40:16 +02:00
Anatol Belski
b7a5d52e98 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Upgrade bundled libmagic to 5.31
 2017-10-11 18:24:29 +02:00
Anatol Belski
08d8623dec Upgrade bundled libmagic to 5.31 2017-10-11 18:18:55 +02:00
Christoph M. Becker
a332eaf7f6 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
 2017-10-11 17:40:12 +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
9c006651c4 Test requires mbstring – skip if not available 2017-10-11 15:27:56 +02:00
Christoph M. Becker
cfbc93c88b Merge branch 'PHP-7.2' 
* PHP-7.2:
  Use PHP_VERSION for exif
 2017-10-11 15:01:23 +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
2e0db496fa Fixed file_cache broken by recent AST related changes. 2017-10-10 19:37:46 +03:00
Dmitry Stogov
70b2ec5874 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed cleanup after optimization passes
 2017-10-10 19:37:40 +03:00
Dmitry Stogov
2929110ce1 Fixed cleanup after optimization passes 2017-10-10 19:25:51 +03:00
Dmitry Stogov
97e7521e49 AST don't have to be COPYABLE anymore. 2017-10-10 15:45:03 +03:00
Anatol Belski
05b9f967a9 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix path in makefile fragment
 2017-10-10 14:33:31 +02:00
Anatol Belski
ad279bd180 Fix path in makefile fragment 2017-10-10 14:32:19 +02:00
Dmitry Stogov
ef5ea48741 Always use IS_CONSTANT_AST (IS_CONSTANT is removed). 2017-10-10 10:11:05 +03:00
Sara Golemon
e05cba0806 Make GMP more usable by third-party extensions. 
Export a PHPAPI function to return gmp_ce (and make the actual storage static).
Provide gmp_object struct in header w/ inline accessor.
Install php_gmp_int.h header.

Remove unnecessary `#ifdef HAVE_GMP` checks.
 2017-10-09 13:23:10 -04:00
Dmitry Stogov
39ded1d5f8 Changed zend_ast_ref structure to use only one allocation, removing dichotomy between heap/arena ASTs. 2017-10-09 16:57:51 +03:00
Anatol Belski
65f610bd9f Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix array access on undeclared properties in DateInterval
 2017-10-09 15:40:00 +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
Peter Kokot
3ed3bc3a0c Update README information for the libmbfl library 
The libmbfl library is bundled with PHP and has its own repository for
development and bug fixes. To avoid confusion and faster development the
README has been updated to include the information of the original library and
to use the bundled library as a fork of the upstream repository instead.
 2017-10-08 17:51:02 +02:00
Peter Kokot
a57de26c3d Refactor mbstring READMEs 2017-10-08 17:51:02 +02:00
Peter Kokot
60909f391d Remove code examples from dom extension 
PHP documentation is a better place to present code examples. Tests
for ext/dom already include all used PHP code.
 2017-10-08 17:50:17 +02:00
Peter Kokot
3644cc6111 Remove some old apache2filter occurrences 
apache2filter was supported in PHP <= 5.6. This patch removes some old
apache2filter occurrences. Also FreeBSD warning therefore is not needed
anymore when building PHP with apache2filter and in later versions don't
need to set the --with-tsrm-pth option.
 2017-10-08 17:48:47 +02:00
Peter Kokot
556e5698dd Remove README from ext/tidy in favor of the PHP docs 
The tidy introduction includes an outdated link to tidy HTML library homepage,
and PHP documentation presents the tidy PHP extension better instead.
 2017-10-08 14:43:43 +02:00
Peter Kokot
978f53afa6 Remove outdated README from ext/com_dotnet 
The PHP documentation includes updated and better com_dotnet
information.
 2017-10-08 14:41:52 +02:00
Peter Kokot
784917bd64 Remove done TODO file from date extension 
TODO file for date extension has been outdated:

- date_default_timezone_set_error.phpt includes checking that
  date_default_timezone_set() validates the passed timezone identifiers.

- ext/date/php_date.c includes timezone caching

- errors are included in date_parse() return value.
 2017-10-08 14:41:17 +02:00
Sara Golemon
e66e2731b8 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
  Add line numbers to Optimizer debug output
 2017-10-07 10:14:11 -04: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
c5ca991d80 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
 2017-10-06 17:16:54 +02: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
Rasmus Lerdorf
9fe6b29356 Add line numbers to Opcache's zend_dump_op() debug output 2017-10-06 11:03:07 -03:00
Dmitry Stogov
45ee78e040 mb_convert_variables() refactored to use simple recursion. 
Fixed incorrect recursion protection (previous implementation kept protection flag or apply counter in non-zero state).
 2017-10-06 12:08:55 +03:00
Dmitry Stogov
254b74b85f HASH_FLAG_PERSISTENT renamed into IS_ARRAY_PERSISTENT and moved into GC_FLAGS (to be consistent with IS_STR_PERSISTENT). 2017-10-06 02:54:14 +03:00
Dmitry Stogov
cb9d81ef4f Refactored recursion pretection 2017-10-06 01:34:50 +03:00
Peter Kokot
39ea632f74 Join untracked files to root .gitignore 2017-10-05 12:36:47 +02:00
Peter Kokot
5971180aa6 Remove PHP examples from simplexml 2017-10-05 12:35:19 +02:00
Peter Kokot
d5cb358765 Remove enchant PHP example 2017-10-05 12:34:43 +02:00
Peter Kokot
74124de048 Use PHP_VERSION for exif 2017-10-04 23:25:36 +02:00
Dmitry Stogov
e70618aff6 Changed the way VM accesses constant operands in 64-bit builds. 2017-10-04 16:53:01 +03:00
Dmitry Stogov
2cbc75ec63 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed rarely possible use-after-free
 2017-10-04 16:40:03 +03: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
e7afdb0668 Fixed invalid type 2017-10-04 16:06:57 +03:00
Dmitry Stogov
b611878bb8 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
 2017-10-04 10:00:07 +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
Peter Kokot
6ad96c337d
Remove done TODO line from ext/date 2017-10-03 07:26:21 +01:00
Peter Kokot
83e881bbb6
Remove outdated README from ext/gmp 
The PHP manual now includes better GMP introduction with updated links
to GNU MP library homepage.
 2017-10-03 07:25:35 +01:00
Peter Kokot
f323636868
Remove exif PHP example files 
The PHP documentation has all exif functions well documented so these
can be left out of php-src. The exif PHP tests also include all exif_*
functions.
 2017-10-03 07:24:51 +01:00
Dmitry Stogov
4d69587035 Fixed compilation errors 2017-10-03 09:08:28 +03:00
Remi Collet
d68879c734 Merge branch 'PHP-7.2' 
* PHP-7.2:
  NEWS
  Fix Bug #75284 sha3 is not supported on bigendian machine
  NEWS
 2017-10-03 06:42:48 +02:00
Remi Collet
d67873ec99 Fix Bug #75284 sha3 is not supported on bigendian machine 2017-10-03 06:41:46 +02:00
Frank Denis
bcb6e6d949 Merge branch 'PHP-7.2' 
* PHP-7.2:
  ext/sodium: untab tests
  ext/sodium: import secretstream test
  ext/sodium: sodium_compare() is always available
  ext/sodium: fix funky indentation
  ext/sodium: move pwhash_scrypt() after pwhash()
  ext/sodium: checks for crypto_box_SEALBYTES are not required
  ext/sodium: explicitly include <string.h>
  ext/sodium: zend_parse_parameters -> zend_parse_parameters_throw
  ext/sodium: fix funky indent on zend_parse_parameters_throw() calls
  ext/sodium: import bindings for secretstream
  ext/sodium: add crypto_pwhash_str_needs_rehash()
  ext/sodium: +base64 codecs (timing-safe)
  ext/sodium: add arginfo definitions that will be required later
  ext/sodium: sort prototypes
 2017-10-02 22:32:22 +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
Sara Golemon
320c4f22a4
Guard against AI_NUMERICSERV not being defined. 2017-10-01 21:32:31 -04:00
Frank Denis
b76c97c254 Merge branch 'PHP-7.2' 
* PHP-7.2:
  ext/sodium: fix pwhash_argon2i test
 2017-10-01 16:01:25 +02: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
0ce1f8df13 Merge branch 'patch-experimental' of https://github.com/petk/php-src 
* 'patch-experimental' of https://github.com/petk/php-src:
  Remove EXPERIMENTAL files from fileinfo and pdo_odbc stable extensions
 2017-09-30 12:24:39 +08:00
Xinchen Hui
cca828b609 Merge branch 'patch-mysqli-todo' of https://github.com/petk/php-src 
* 'patch-mysqli-todo' of https://github.com/petk/php-src:
  Remove done and old TODO file from ext/mysqli
 2017-09-30 12:23:14 +08:00
Xinchen Hui
97eb1a072b Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75279

Conflicts:
	ext/standard/dl.c
 2017-09-30 12:16:05 +08: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
Peter Kokot
e06a2c150a Remove done and old TODO file from ext/mysqli 
Since PHP documentation and ini settings should be updated for the
mysqli extension, this patch removes an old and done TODO file from
ext/mysqli folder.
 2017-09-30 03:23:28 +02:00
Peter Kokot
5cf017a132 Remove EXPERIMENTAL files from fileinfo and pdo_odbc stable extensions 2017-09-30 01:58:08 +02:00
Remi Collet
c8f50ed322 Merge branch 'PHP-7.2' 
* PHP-7.2:
  NEWS
  Fixed bug #75285i Broken build when system libpcre don't have jit support
 2017-09-29 15:50:49 +02: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
5cf046d0e7 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Revert --with-pcre-valgrind by default in debug build
 2017-09-29 12:26:31 +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
95272f0b4a Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75267 (possible &/&& mixup)
 2017-09-29 11:18:13 +08: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
945d0e1928 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Apply upstream patch for CVE-2016-1283
 2017-09-28 15:45:47 +02: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
eca3bc59b2 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix mkdir() special case for path length < 260 and > 248
 2017-09-28 13:20:09 +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
1f8970c156 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75255 (Request hangs and not finish)
 2017-09-27 17:18:17 +03: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
Joe Watkins
a4da53a654
Merge branch 'PHP-7.2' 
* PHP-7.2:
  fix bug #75222 DateInterval microseconds property always 0
 2017-09-27 06:24:46 +01:00
jhdxr
7deb561f75
fix bug #75222 DateInterval microseconds property always 0 2017-09-27 06:23:42 +01:00
Joe Watkins
e2e3c981b5
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed #75220 - Segfault when calling is_callable on parent
 2017-09-27 06:09:24 +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
ab13da943d Merge branch 'PHP-7.2' 
* PHP-7.2:
  ext/sodium: call crypto_pwhash_argon2id() explicitly if required
  ext/sodium: avoid tautological comparisons
 2017-09-26 18:10:37 +02: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
cb394229b8 Merge branch 'PHP-7.2' 
* PHP-7.2:
  ext/sodium: signing empty messages is fine
 2017-09-26 17:38:09 +02:00
Frank Denis
f64d00d684 ext/sodium: signing empty messages is fine 2017-09-26 17:37:04 +02:00
Dmitry Stogov
5b849d903a Split CFG after RECV independently from ZEND_ACC_HAS_TYPE_HINTS flag. 2017-09-26 15:40:29 +03:00
Nikita Popov
49d895af86 Merge branch 'PHP-7.2' 2017-09-26 09:21:16 +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
842dba8f6f Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix PHP_GD_TTSTR: command not found warning in ext/gd
 2017-09-26 00:47:09 +02:00