]> granicus.if.org Git - php/log
php
8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 15 Jan 2017 20:20:18 +0000 (21:20 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix AppVeyor failures with Opcache enabled

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 15 Jan 2017 20:18:48 +0000 (21:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix AppVeyor failures with Opcache enabled

8 years agofix AppVeyor failures with Opcache enabled
Anatol Belski [Sun, 15 Jan 2017 20:13:15 +0000 (21:13 +0100)]
fix AppVeyor failures with Opcache enabled

opcache_reset() only schedules the restart. Under circumstances,
the follow up requests might run uncached, until the restart
condition is met. To mitigate the false positives caused by this
behavior, any tests using opcache_reset() should not be put in
between other tests. Thus, moving the corresponding test to be
executed last.

8 years agoFix small mistake in generator creation introduced in 9a159f37
Bob Weinand [Sun, 15 Jan 2017 18:26:15 +0000 (19:26 +0100)]
Fix small mistake in generator creation introduced in 9a159f37

8 years agoRevert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into...
Anatol Belski [Sun, 15 Jan 2017 16:15:46 +0000 (17:15 +0100)]
Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"

This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing
changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.

(cherry picked from commit 57736cc937fc6dfdfb403293d7bf88b264e83e15)

Something went wrong, so the revert didn't land in master.
Cherry-picking extra therefore.

8 years agoFix segfault in `pcntl_signal_handler` (bug #73939)
Adam Saponara [Sun, 15 Jan 2017 02:51:33 +0000 (21:51 -0500)]
Fix segfault in `pcntl_signal_handler` (bug #73939)

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sat, 14 Jan 2017 13:13:49 +0000 (14:13 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 14 Jan 2017 13:13:23 +0000 (14:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #69993
Yordan Gigov [Fri, 12 Aug 2016 14:52:18 +0000 (17:52 +0300)]
Fixed bug #69993

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sat, 14 Jan 2017 12:53:58 +0000 (13:53 +0100)]
Merge branch 'PHP-7.1'

8 years agoFix bug #69061
Tom Sommer [Sat, 14 Jan 2017 12:51:12 +0000 (13:51 +0100)]
Fix bug #69061

Make mail.log append correct PHP_EOL and remove timestamp when
sending to syslog.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sat, 14 Jan 2017 12:28:52 +0000 (13:28 +0100)]
Merge branch 'PHP-7.1'

8 years agoAdd hash_hkdf()
Andrey Andreev [Wed, 11 Jan 2017 19:54:38 +0000 (21:54 +0200)]
Add hash_hkdf()

8 years agoMerge branch 'PHP-7.1'
Joe Watkins [Sat, 14 Jan 2017 07:33:35 +0000 (07:33 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Added test for "opcache: print restart reason" to basic_logging.phpt

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Sat, 14 Jan 2017 07:33:08 +0000 (07:33 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Added test for "opcache: print restart reason" to basic_logging.phpt

8 years agoAdded test for "opcache: print restart reason" to basic_logging.phpt
Mitch Hagstrand [Sat, 14 Jan 2017 00:33:05 +0000 (16:33 -0800)]
Added test for "opcache: print restart reason" to basic_logging.phpt

8 years agoWrite $http_response_header to local var at end
Nikita Popov [Thu, 5 May 2016 14:45:13 +0000 (16:45 +0200)]
Write $http_response_header to local var at end

Rather than trying to modify it mid-request. The protection against
tampering that was used (addref) violates COW because an rc>1 array
is being modified.

Test bug69337.phpt changed because it was testing tampering with
$http_response_header while the HTTP request is being executed.
This simply no longer matters, so behavior is the same as if no
tampering occurred.

8 years agoopcache: print restart reason
Alexander Polyakov [Fri, 13 Jan 2017 11:55:10 +0000 (14:55 +0300)]
opcache: print restart reason

8 years agoopcache: print restart reason
Alexander Polyakov [Fri, 13 Jan 2017 11:55:10 +0000 (14:55 +0300)]
opcache: print restart reason

8 years agoopcache: print restart reason
Alexander Polyakov [Fri, 13 Jan 2017 11:55:10 +0000 (14:55 +0300)]
opcache: print restart reason

8 years agoFixed nullable handling (phpunit failure)
Dmitry Stogov [Fri, 13 Jan 2017 16:51:12 +0000 (19:51 +0300)]
Fixed nullable handling (phpunit failure)

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 13 Jan 2017 16:23:05 +0000 (17:23 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix remaining tests for Opcache runs

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 13 Jan 2017 16:21:01 +0000 (17:21 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix remaining tests for Opcache runs

8 years agofix remaining tests for Opcache runs
Anatol Belski [Fri, 13 Jan 2017 16:16:15 +0000 (17:16 +0100)]
fix remaining tests for Opcache runs

The fail reason here is the TMP change while both top and test
run same binary with opcache enabled.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 13 Jan 2017 15:55:49 +0000 (16:55 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  ensure the end path wouldn't contain double slashes

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 13 Jan 2017 15:54:10 +0000 (16:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  ensure the end path wouldn't contain double slashes

8 years agoensure the end path wouldn't contain double slashes
Anatol Belski [Fri, 13 Jan 2017 15:50:05 +0000 (16:50 +0100)]
ensure the end path wouldn't contain double slashes

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 13 Jan 2017 14:50:36 +0000 (15:50 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  templatize the resource number

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 13 Jan 2017 14:48:33 +0000 (15:48 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  templatize the resource number

8 years agotemplatize the resource number
Anatol Belski [Fri, 13 Jan 2017 14:45:35 +0000 (15:45 +0100)]
templatize the resource number

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 13 Jan 2017 14:35:42 +0000 (15:35 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  refix test

8 years agorefix test
Anatol Belski [Fri, 13 Jan 2017 14:31:10 +0000 (15:31 +0100)]
refix test

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 13 Jan 2017 13:46:44 +0000 (14:46 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix test
  Fix test runs with Opcache enabled PHP on top

8 years agofix test
Anatol Belski [Fri, 13 Jan 2017 13:40:31 +0000 (14:40 +0100)]
fix test

Same as before actulaly - the host process running with Opcache
enabled, all the intermediate scripts land in cache. So the count
can be variable, maybe even better to just test for > 0.

8 years agoFix test runs with Opcache enabled PHP on top
Anatol Belski [Fri, 13 Jan 2017 13:37:37 +0000 (14:37 +0100)]
Fix test runs with Opcache enabled PHP on top

Writing to the same file, while it's cached, is an issue.

8 years agoAvoid NULL dereference
Dmitry Stogov [Fri, 13 Jan 2017 09:51:23 +0000 (12:51 +0300)]
Avoid NULL dereference

8 years agoIntroduced "zend_type" - an abstraction for type-hinting representation.
Dmitry Stogov [Fri, 13 Jan 2017 08:37:46 +0000 (11:37 +0300)]
Introduced "zend_type" - an abstraction for type-hinting representation.

8 years agoMerge branch 'PHP-7.1'
Joe Watkins [Fri, 13 Jan 2017 06:45:31 +0000 (06:45 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Increase wait time for tests involving sockets to improve Travis relability

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Fri, 13 Jan 2017 06:45:17 +0000 (06:45 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability

8 years agoIncrease wait time for tests involving sockets to improve Travis relability
Mitch Hagstrand [Fri, 13 Jan 2017 06:09:46 +0000 (22:09 -0800)]
Increase wait time for tests involving sockets to improve Travis relability

1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Fri, 13 Jan 2017 05:05:51 +0000 (13:05 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Remove redundant reference handling
  Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)

8 years agoRemove redundant reference handling
Xinchen Hui [Fri, 13 Jan 2017 05:05:22 +0000 (13:05 +0800)]
Remove redundant reference handling

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Fri, 13 Jan 2017 05:04:53 +0000 (13:04 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)

8 years agoFixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)
Xinchen Hui [Fri, 13 Jan 2017 05:04:37 +0000 (13:04 +0800)]
Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 12 Jan 2017 21:46:24 +0000 (22:46 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Thu, 12 Jan 2017 21:45:18 +0000 (22:45 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 12 Jan 2017 21:08:20 +0000 (22:08 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()

8 years agoFixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()
Anatol Belski [Thu, 12 Jan 2017 21:06:03 +0000 (22:06 +0100)]
Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()

8 years agoFix memory error in reflection export
Nikita Popov [Thu, 12 Jan 2017 20:50:53 +0000 (21:50 +0100)]
Fix memory error in reflection export

Also simplify code while at it ... no point in going through a
smart_str for a single printf.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Thu, 12 Jan 2017 20:16:13 +0000 (21:16 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 12 Jan 2017 20:14:42 +0000 (21:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #69899
rfussenegger [Fri, 30 Sep 2016 08:49:08 +0000 (10:49 +0200)]
Fix bug #69899

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 12 Jan 2017 18:01:19 +0000 (19:01 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Thu, 12 Jan 2017 17:59:36 +0000 (18:59 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Thu, 12 Jan 2017 17:54:06 +0000 (18:54 +0100)]
Merge branch 'PHP-7.1'

8 years agoFixed bug #73374
Leigh [Mon, 31 Oct 2016 16:25:33 +0000 (16:25 +0000)]
Fixed bug #73374

Add "0b" prefix detection to intval($str, 0). The implementation
is relatively complicated because we need to handle whitespace and
sign.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 12 Jan 2017 16:27:14 +0000 (17:27 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73904 php-cgi fails to load -c specified php.ini file

8 years agoFixed bug #73904 php-cgi fails to load -c specified php.ini file
Anatol Belski [Thu, 12 Jan 2017 16:25:26 +0000 (17:25 +0100)]
Fixed bug #73904 php-cgi fails to load -c specified php.ini file

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 12 Jan 2017 13:17:23 +0000 (14:17 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73904 php-cgi fails to load -c specified php.ini file

8 years agoFixed bug #73904 php-cgi fails to load -c specified php.ini file
Anatol Belski [Thu, 12 Jan 2017 13:15:21 +0000 (14:15 +0100)]
Fixed bug #73904 php-cgi fails to load -c specified php.ini file

8 years agoMerge branch 'master' of git.php.net:/php-src
Joe Watkins [Thu, 12 Jan 2017 09:24:47 +0000 (09:24 +0000)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Update to SQLite 3.16.2

8 years agoMerge branch 'PHP-7.1'
Joe Watkins [Thu, 12 Jan 2017 09:10:53 +0000 (09:10 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #72680 gdbinit print_cvs not prepared for PHP 7

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Thu, 12 Jan 2017 09:10:39 +0000 (09:10 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #72680 gdbinit print_cvs not prepared for PHP 7

8 years agoFixed bug #72680 gdbinit print_cvs not prepared for PHP 7
Mitch Hagstrand [Thu, 12 Jan 2017 04:57:33 +0000 (20:57 -0800)]
Fixed bug #72680 gdbinit print_cvs not prepared for PHP 7

8 years agoUpdate to SQLite 3.16.2
Christoph M. Becker [Wed, 11 Jan 2017 23:14:55 +0000 (00:14 +0100)]
Update to SQLite 3.16.2

8 years agoMerge branch 'PHP-7.1'
Joe Watkins [Wed, 11 Jan 2017 11:18:38 +0000 (11:18 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  added a note to opache.fast_shutdown why its not enabled by default in php.ini

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 11 Jan 2017 11:18:26 +0000 (11:18 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  added a note to opache.fast_shutdown why its not enabled by default in php.ini

8 years agoadded a note to opache.fast_shutdown why its not enabled by default in php.ini
Markus Staab [Wed, 11 Jan 2017 10:51:25 +0000 (11:51 +0100)]
added a note to opache.fast_shutdown why its not enabled by default in php.ini

8 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Joe Watkins [Wed, 11 Jan 2017 08:12:51 +0000 (08:12 +0000)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  Fixed bug #67707 IV not needed for ECB encryption mode, but it returns a warning
  Fixed #73907 (nextSibling property not included in var_dump of DOMNode)
  Fixed bug #61858 (DOMAttr debug info generates E_WARNING)
  Fix glob-wrapper.phpt to not fail in Windows
  Fix #73893: A hidden danger of death cycle in a function of gd

8 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Joe Watkins [Wed, 11 Jan 2017 08:12:40 +0000 (08:12 +0000)]
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 #67707 IV not needed for ECB encryption mode, but it returns a warning
  Add support for "xfail" to phpt SKIPIF sections
  Fixed #73907 (nextSibling property not included in var_dump of DOMNode)
  Fixed bug #61858 (DOMAttr debug info generates E_WARNING)
  Fix glob-wrapper.phpt to not fail in Windows
  Set a session path for this test
  Fix #73893: A hidden danger of death cycle in a function of gd
  Missing %s
  Ok, maybe Nikita is right. We should default this on.
  Missed one. This needs gc as well
  These tests expect gc to be enabled

8 years agoMerge branch 'master' of git.php.net:/php-src
Joe Watkins [Wed, 11 Jan 2017 08:12:22 +0000 (08:12 +0000)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Fixed bug #67707 IV not needed for ECB encryption mode, but it returns a warning
  Add support for "xfail" to phpt SKIPIF sections
  Fixed #73907 (nextSibling property not included in var_dump of DOMNode)
  Fixed bug #61858 (DOMAttr debug info generates E_WARNING)
  Fix glob-wrapper.phpt to not fail in Windows
  Set a session path for this test
  Set a session path for this test
  Fix #73893: A hidden danger of death cycle in a function of gd
  Missing %s
  Missing %s
  More missing gc inis
  Ok, maybe Nikita is right. We should default this on.
  Missed one. This needs gc as well
  Missed one. This needs gc as well
  These tests rely on gc being enabled
  These tests expect gc to be enabled

8 years agoMerge branch 'PHP-7.1'
Joe Watkins [Wed, 11 Jan 2017 08:10:58 +0000 (08:10 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #71219 configure script incorrectly checks for ttyname_r

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 11 Jan 2017 08:09:55 +0000 (08:09 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #71219 configure script incorrectly checks for ttyname_r

8 years agoFixed bug #71219 configure script incorrectly checks for ttyname_r
Joe Watkins [Wed, 11 Jan 2017 08:09:10 +0000 (08:09 +0000)]
Fixed bug #71219 configure script incorrectly checks for ttyname_r

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Tue, 10 Jan 2017 22:45:01 +0000 (23:45 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 10 Jan 2017 22:44:45 +0000 (23:44 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #67707 IV not needed for ECB encryption mode, but it returns a warning
Robrecht Plaisier [Fri, 14 Aug 2015 19:16:09 +0000 (19:16 +0000)]
Fixed bug #67707 IV not needed for ECB encryption mode, but it returns a warning

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Tue, 10 Jan 2017 22:32:46 +0000 (23:32 +0100)]
Merge branch 'PHP-7.1'

8 years agoAdd support for "xfail" to phpt SKIPIF sections
Nikita Popov [Tue, 22 Nov 2016 21:43:23 +0000 (22:43 +0100)]
Add support for "xfail" to phpt SKIPIF sections

If SKIPIF output starts with "xfail" instead of "skip", the test
will be marked as XFAIL with the following message. Example:

    --TEST--
    Test xfailif feature
    --SKIPIF--
    <?php
    if (some_cond()) die('xfail Expected to fail!');
    ?>
    --FILE--
    ...

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Tue, 10 Jan 2017 22:29:50 +0000 (23:29 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 10 Jan 2017 22:29:16 +0000 (23:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed #73907 (nextSibling property not included in var_dump of DOMNode)
Arnout Boks [Tue, 10 Jan 2017 19:48:45 +0000 (20:48 +0100)]
Fixed #73907 (nextSibling property not included in var_dump of DOMNode)

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Tue, 10 Jan 2017 22:25:23 +0000 (23:25 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 10 Jan 2017 22:24:41 +0000 (23:24 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #61858 (DOMAttr debug info generates E_WARNING)
Arnout Boks [Tue, 10 Jan 2017 20:19:37 +0000 (21:19 +0100)]
Fixed bug #61858 (DOMAttr debug info generates E_WARNING)

It seems fair to remove this warning, given that:

* it is not documented in the official documentation
* the $specified property, which has a similar 'not implemented' status,
  also does not trigger a warning
* it apparently hinders quite a lot of people during debugging, judging by
  the number of votes on the bug

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Tue, 10 Jan 2017 22:19:43 +0000 (23:19 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 10 Jan 2017 22:19:30 +0000 (23:19 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Tue, 10 Jan 2017 22:19:19 +0000 (23:19 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix glob-wrapper.phpt to not fail in Windows
Mitch Hagstrand [Tue, 10 Jan 2017 19:51:55 +0000 (11:51 -0800)]
Fix glob-wrapper.phpt to not fail in Windows

8 years agoSet a session path for this test
Rasmus Lerdorf [Tue, 10 Jan 2017 20:18:36 +0000 (15:18 -0500)]
Set a session path for this test

8 years agoSet a session path for this test
Rasmus Lerdorf [Tue, 10 Jan 2017 20:17:50 +0000 (15:17 -0500)]
Set a session path for this test

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Tue, 10 Jan 2017 19:15:05 +0000 (20:15 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix #73893: A hidden danger of death cycle in a function of gd

# Conflicts:
# ext/gd/libgd/gd_rotate.c

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 10 Jan 2017 19:12:42 +0000 (20:12 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #73893: A hidden danger of death cycle in a function of gd

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Tue, 10 Jan 2017 19:08:59 +0000 (20:08 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Missing %s

8 years agoFix #73893: A hidden danger of death cycle in a function of gd
Christoph M. Becker [Tue, 10 Jan 2017 18:31:33 +0000 (19:31 +0100)]
Fix #73893: A hidden danger of death cycle in a function of gd

We remove the unused, but potentially dangerous functions.

8 years agoMissing %s
Rasmus Lerdorf [Tue, 10 Jan 2017 18:51:19 +0000 (13:51 -0500)]
Missing %s

8 years agoMissing %s
Rasmus Lerdorf [Tue, 10 Jan 2017 18:50:49 +0000 (13:50 -0500)]
Missing %s

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Tue, 10 Jan 2017 18:49:54 +0000 (19:49 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Ok, maybe Nikita is right. We should default this on.
  Missed one. This needs gc as well
  These tests expect gc to be enabled

8 years agoMore missing gc inis
Rasmus Lerdorf [Tue, 10 Jan 2017 17:17:31 +0000 (12:17 -0500)]
More missing gc inis

8 years agoOk, maybe Nikita is right. We should default this on.
Rasmus Lerdorf [Tue, 10 Jan 2017 17:16:45 +0000 (12:16 -0500)]
Ok, maybe Nikita is right. We should default this on.