]>
granicus.if.org Git - php/log
Nikita Popov [Thu, 2 Mar 2017 11:36:31 +0000 (12:36 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 2 Mar 2017 11:36:04 +0000 (12:36 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
somedaysummer [Fri, 27 Jan 2017 20:20:07 +0000 (15:20 -0500)]
PHP bug #74004
Fix for DOMDocument loadHTML and loadHTMLFile ignore LIBXML_NOWARNING
and LIBXML_NOERROR flags.
Derick Rethans [Thu, 2 Mar 2017 11:28:17 +0000 (11:28 +0000)]
Merge branch 'PHP-7.1'
Derick Rethans [Thu, 2 Mar 2017 11:28:09 +0000 (11:28 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Thu, 2 Mar 2017 11:28:02 +0000 (11:28 +0000)]
Fixed tests after tzdb removed abbreviations
Derick Rethans [Thu, 2 Mar 2017 11:27:44 +0000 (11:27 +0000)]
Make sure we anchor this test to February
Eric Poe [Sat, 4 Feb 2017 02:56:18 +0000 (21:56 -0500)]
Add test-case from bug #55157
The issue itself is not fixed, this is just a workaround.
Nikita Popov [Thu, 2 Mar 2017 11:14:00 +0000 (12:14 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 2 Mar 2017 11:13:38 +0000 (12:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Mitch Hagstrand [Wed, 1 Mar 2017 23:08:59 +0000 (15:08 -0800)]
Fix bug73858.phpt to work in months without 31 days
Used hardcoded months in bug73858.phpt rather than the current and previous
month.
Christopher Jones [Thu, 2 Mar 2017 04:35:19 +0000 (15:35 +1100)]
Update NEWS
Christopher Jones [Thu, 2 Mar 2017 04:34:47 +0000 (15:34 +1100)]
Update NEWs
Christopher Jones [Thu, 2 Mar 2017 04:33:50 +0000 (15:33 +1100)]
Merge branch 'PHP-7.1'
Christopher Jones [Thu, 2 Mar 2017 04:33:25 +0000 (15:33 +1100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Thu, 2 Mar 2017 04:28:01 +0000 (15:28 +1100)]
Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated)
This was a modification of an incomplete PR #2276.
Adam Baratz [Wed, 1 Mar 2017 21:28:47 +0000 (16:28 -0500)]
Remove dead code related to error constants
Adam Baratz [Wed, 1 Mar 2017 21:27:26 +0000 (16:27 -0500)]
Remove PHP5-specific code
Derick Rethans [Wed, 1 Mar 2017 20:07:53 +0000 (20:07 +0000)]
Updated to version 2017.1 (2017a)
Derick Rethans [Wed, 1 Mar 2017 20:07:52 +0000 (20:07 +0000)]
Empty merge
Derick Rethans [Wed, 1 Mar 2017 20:07:51 +0000 (20:07 +0000)]
Updated to version 2017.1 (2017a)
Derick Rethans [Wed, 1 Mar 2017 20:07:51 +0000 (20:07 +0000)]
Updated to version 2017.1 (2017a)
Derick Rethans [Wed, 1 Mar 2017 20:07:51 +0000 (20:07 +0000)]
Empty merge
Remi Collet [Wed, 1 Mar 2017 16:03:11 +0000 (17:03 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
make type consistent with glob_t.gl_pathc
Remi Collet [Wed, 1 Mar 2017 16:02:42 +0000 (17:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
make type consistent with glob_t.gl_pathc
Remi Collet [Wed, 1 Mar 2017 16:01:58 +0000 (17:01 +0100)]
make type consistent with glob_t.gl_pathc
Sara Golemon [Wed, 1 Mar 2017 01:18:08 +0000 (17:18 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix potential crash when setting invalid declare value
Sara Golemon [Wed, 1 Mar 2017 01:17:41 +0000 (17:17 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix potential crash when setting invalid declare value
Sara Golemon [Wed, 22 Feb 2017 21:56:38 +0000 (13:56 -0800)]
Fix potential crash when setting invalid declare value
Using a non-literal expression in a declare value can cause the
compiler to crash trying to turn that AST node into a usable zval.
There was an existing test for such values using 'encoding',
but that didn't crash because it's handled by the lexer
rather than being compiled.
Trying to use a non-literal with ticks reproduces the crash.
Remi Collet [Tue, 28 Feb 2017 10:36:42 +0000 (11:36 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
make test slower again
Remi Collet [Tue, 28 Feb 2017 10:36:24 +0000 (11:36 +0100)]
make test slower again
Joe Watkins [Tue, 28 Feb 2017 09:08:34 +0000 (09:08 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
prepare 7.1.4
Joe Watkins [Tue, 28 Feb 2017 09:08:05 +0000 (09:08 +0000)]
prepare 7.1.4
Anatol Belski [Tue, 28 Feb 2017 08:52:44 +0000 (09:52 +0100)]
Merge branch 'PhP-7.1'
* PhP-7.1:
prepare next
Anatol Belski [Tue, 28 Feb 2017 08:47:56 +0000 (09:47 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
prepare next
Anatol Belski [Tue, 28 Feb 2017 08:46:11 +0000 (09:46 +0100)]
prepare next
Joe Watkins [Mon, 27 Feb 2017 19:21:51 +0000 (19:21 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Revert "fix crash in phpdbg shutdown process when opcache is loaded"
Joe Watkins [Mon, 27 Feb 2017 19:21:37 +0000 (19:21 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "fix crash in phpdbg shutdown process when opcache is loaded"
Joe Watkins [Mon, 27 Feb 2017 19:21:10 +0000 (19:21 +0000)]
Revert "fix crash in phpdbg shutdown process when opcache is loaded"
This reverts commit
008fb28eafa3740b1e3696b1a5cf7566d493b97d .
Joe Watkins [Mon, 27 Feb 2017 17:55:31 +0000 (17:55 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix crash in phpdbg shutdown process when opcache is loaded
Joe Watkins [Mon, 27 Feb 2017 17:55:14 +0000 (17:55 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix crash in phpdbg shutdown process when opcache is loaded
Joe Watkins [Mon, 27 Feb 2017 17:54:48 +0000 (17:54 +0000)]
fix crash in phpdbg shutdown process when opcache is loaded
Xinchen Hui [Sun, 26 Feb 2017 04:07:03 +0000 (12:07 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74157 (Segfault with nested generators)
Xinchen Hui [Sun, 26 Feb 2017 04:06:29 +0000 (12:06 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Improve fix for bug #73807
Xinchen Hui [Sun, 26 Feb 2017 04:05:56 +0000 (12:05 +0800)]
Fixed bug #74157 (Segfault with nested generators)
Nikita Popov [Sat, 25 Feb 2017 11:58:03 +0000 (12:58 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 25 Feb 2017 11:57:53 +0000 (12:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 25 Feb 2017 11:55:14 +0000 (12:55 +0100)]
Improve fix for bug #73807
At least on some architectures memmove() on FreeBSD does not
short-curcuit if src==dst. Check for it explicitly to avoid
quadratic copying.
Xinchen Hui [Sat, 25 Feb 2017 04:00:57 +0000 (12:00 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74164 (PHP hangs when an invalid value is dynamically passed to typehinted by-ref arg)
Fixed typo (it should be typo)
Xinchen Hui [Sat, 25 Feb 2017 04:00:42 +0000 (12:00 +0800)]
Fixed bug #74164 (PHP hangs when an invalid value is dynamically passed to typehinted by-ref arg)
Xinchen Hui [Sat, 25 Feb 2017 03:10:37 +0000 (11:10 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Fix bug #73127
Support run or test target invoked within debugger
Update test for bug #74159
Update NEWS
Fix bug #74159
Tom Van Looy [Fri, 24 Feb 2017 21:25:51 +0000 (22:25 +0100)]
fix command not found warning in ext/gd
./configure: line 32011: PHP_GD_TTSTR: command not found
Nikita Popov [Fri, 24 Feb 2017 22:22:46 +0000 (23:22 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 24 Feb 2017 22:22:24 +0000 (23:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Grundik [Sat, 18 Feb 2017 02:53:13 +0000 (05:53 +0300)]
Fix bug #73127
gost-crypto hash was incorrect if input data contained long 0xFF
sequence, due to a carry-propagation bug.
Anatol Belski [Fri, 24 Feb 2017 18:43:26 +0000 (19:43 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Support run or test target invoked within debugger
Anatol Belski [Fri, 24 Feb 2017 18:41:30 +0000 (19:41 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Support run or test target invoked within debugger
Anatol Belski [Fri, 24 Feb 2017 18:37:16 +0000 (19:37 +0100)]
Support run or test target invoked within debugger
Useful, as it gets all the environment produced by the makefile. For the
test target, it might make sense to have the child process debug plugin
for VS installed.
Anatol Belski [Fri, 24 Feb 2017 10:44:39 +0000 (11:44 +0100)]
fix test, yet master staging only
Aaron Piotrowski [Fri, 24 Feb 2017 04:56:25 +0000 (22:56 -0600)]
Merge branch 'PHP-7.1'
Aaron Piotrowski [Fri, 24 Feb 2017 04:56:04 +0000 (22:56 -0600)]
Merge branch 'PHP-7.0' into PHP-7.1
Aaron Piotrowski [Fri, 24 Feb 2017 04:24:59 +0000 (22:24 -0600)]
Update test for bug #74159
Aaron Piotrowski [Fri, 24 Feb 2017 03:22:28 +0000 (21:22 -0600)]
Merge branch 'PHP-7.1'
Aaron Piotrowski [Fri, 24 Feb 2017 03:18:09 +0000 (21:18 -0600)]
Merge branch 'PHP-7.0' into PHP-7.1
Aaron Piotrowski [Fri, 24 Feb 2017 03:10:14 +0000 (21:10 -0600)]
Update NEWS
Aaron Piotrowski [Fri, 24 Feb 2017 02:58:12 +0000 (20:58 -0600)]
Fix bug #74159
Thanks to @brzuchal for the patch to xp_ssl.c and @DaveRandom for helping debug the problem.
Xinchen Hui [Thu, 23 Feb 2017 05:58:51 +0000 (13:58 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed typo (it should be typo)
Xinchen Hui [Thu, 23 Feb 2017 05:58:08 +0000 (13:58 +0800)]
Fixed typo (it should be typo)
Xinchen Hui [Thu, 23 Feb 2017 04:47:40 +0000 (12:47 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Add test only (bug doesn't exists in 7.1)
Fixed bug #74152 (if statement says true to a null variable)
Xinchen Hui [Thu, 23 Feb 2017 04:47:15 +0000 (12:47 +0800)]
Add test only (bug doesn't exists in 7.1)
Xinchen Hui [Thu, 23 Feb 2017 04:47:04 +0000 (12:47 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74152 (if statement says true to a null variable)
Xinchen Hui [Thu, 23 Feb 2017 04:33:17 +0000 (12:33 +0800)]
Fixed bug #74152 (if statement says true to a null variable)
Xinchen Hui [Thu, 23 Feb 2017 03:02:48 +0000 (11:02 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
Xinchen Hui [Thu, 23 Feb 2017 03:02:37 +0000 (11:02 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
Xinchen Hui [Thu, 23 Feb 2017 03:02:23 +0000 (11:02 +0800)]
Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
Kalle Sommer Nielsen [Wed, 22 Feb 2017 21:13:33 +0000 (22:13 +0100)]
Fix PHP_OS_FAMILY for Linux (Joe)
Kalle Sommer Nielsen [Wed, 22 Feb 2017 11:31:06 +0000 (12:31 +0100)]
Change PHP_OS_FAMILY slightly
* PHP_OS_FAMILY is now a macro, to allow extensions to take advantage of it, it is defined in php.h
* Values are not upper-case-first, not always uppercase. Windows is no longer just "Win", if we want the short version for testing then PHP_OS is always WINNT anyway
Kalle Sommer Nielsen [Wed, 22 Feb 2017 11:09:59 +0000 (12:09 +0100)]
Fix extra ; causing a build error
Remi Collet [Wed, 22 Feb 2017 07:41:01 +0000 (08:41 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
report about OpenSSL 1.1 not supported during configure
Remi Collet [Wed, 22 Feb 2017 07:40:22 +0000 (08:40 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
report about OpenSSL 1.1 not supported during configure
Remi Collet [Tue, 21 Feb 2017 15:27:51 +0000 (16:27 +0100)]
report about OpenSSL 1.1 not supported during configure
Joe Watkins [Wed, 22 Feb 2017 06:49:22 +0000 (06:49 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
pull-request/2393:
stop fpm make install clobbering dot d configuration
Joe Watkins [Wed, 22 Feb 2017 06:48:48 +0000 (06:48 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
pull-request/2393:
stop fpm make install clobbering dot d configuration
Coenraad Loubser [Tue, 21 Feb 2017 02:02:22 +0000 (04:02 +0200)]
pull-request/2393:
stop make install from clobbering default dot d configuration
Anatol Belski [Tue, 21 Feb 2017 13:37:42 +0000 (14:37 +0100)]
more appropriate var name
Anatol Belski [Tue, 21 Feb 2017 13:36:06 +0000 (14:36 +0100)]
add folds
Anatol Belski [Tue, 21 Feb 2017 11:12:42 +0000 (12:12 +0100)]
use the delivered global arg instead of fetching it
Dmitry Stogov [Tue, 21 Feb 2017 07:48:37 +0000 (10:48 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
too many dashes
Dmitry Stogov [Tue, 21 Feb 2017 07:48:21 +0000 (10:48 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
too many dashes
Dmitry Stogov [Tue, 21 Feb 2017 07:47:48 +0000 (10:47 +0300)]
too many dashes
Dmitry Stogov [Tue, 21 Feb 2017 07:42:59 +0000 (10:42 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5) Include WSDL cache version number into file name
Dmitry Stogov [Tue, 21 Feb 2017 07:42:42 +0000 (10:42 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5) Include WSDL cache version number into file name
Dmitry Stogov [Tue, 21 Feb 2017 07:41:20 +0000 (10:41 +0300)]
Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5)
Include WSDL cache version number into file name
Remi Collet [Sun, 19 Feb 2017 16:02:31 +0000 (17:02 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix test for libzip 1.2.0
Remi Collet [Sun, 19 Feb 2017 16:02:16 +0000 (17:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test for libzip 1.2.0
Remi Collet [Sun, 19 Feb 2017 16:02:00 +0000 (17:02 +0100)]
fix test for libzip 1.2.0
Anatol Belski [Sat, 18 Feb 2017 17:05:55 +0000 (18:05 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
initialize valid_symbol_table, important for the main thread
Anatol Belski [Sat, 18 Feb 2017 17:03:55 +0000 (18:03 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
initialize valid_symbol_table, important for the main thread
Anatol Belski [Sat, 18 Feb 2017 16:58:17 +0000 (17:58 +0100)]
initialize valid_symbol_table, important for the main thread
to prevent php_errormsg population on invalid symlol_table
Andreas Treichel [Thu, 2 Feb 2017 00:09:31 +0000 (01:09 +0100)]
ftp_mlsd(): Parse the MLSD response