clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 13:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,194 Commits 494 Branches 1,367 Tags 788 MiB
bd32837acf
Commit Graph

44060 Commits

Author SHA1 Message Date
andrewnester
f65ae82c55
Fixed #73973 - debug_zval_dump() assertion error for resource consts with --enable-debug 2017-01-26 09:03:47 +00:00
Joe Watkins
76a7470160
Fixed bug #73994 incorrect arginfo for unpack 2017-01-26 06:58:08 +00:00
Joe Watkins
f6f2855ecd
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #54382 (getAttributeNodeNS doesn't get xmlns* attributes)
  Added (failing) testcase for bug #54382
 2017-01-25 20:59:37 +00:00
Arnout Boks
721a189742
Fix bug #54382 (getAttributeNodeNS doesn't get xmlns* attributes) 
The fix is based on the same strategy for handling namespace
declarations as used by getAttributeNode. Note that this strategy makes
these methods not return a DOMAttr for xmlns* attributes, but an
instance of the (undocumented) class DOMNameSpaceNode. This is not
really ideal, but at least this fix makes the behavior of
getAttributeNode and getAttributeNodeNS consistent.

A follow-up action would be to investigate whether DOMNameSpaceNode can
be made into a subclass of DOMAttr (which may be hard due to the way
libxml treats namespace declarations) or document this deviating return
value for xmlns* attributes.
 2017-01-25 20:59:25 +00:00
Arnout Boks
737ee0661c
Added (failing) testcase for bug #54382 2017-01-25 20:59:23 +00:00
Jakub Zelenka
519b0dc886 Fix bug #73978 (openssl_decrypt triggers bug in PDO) 2017-01-25 19:55:05 +00:00
Anatol Belski
ec78507bd4 dirname() should not normalize paths 
This is the BC piece with the case where dirname() is used with an URL.
 2017-01-24 17:56:00 +01:00
Christoph M. Becker
4af464a0df Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add regression test for bug #47946
 2017-01-22 15:02:59 +01:00
Christoph M. Becker
71efe9d8fd Add regression test for bug #47946 
This bug had already been fixed, but apparently there's no regression
test yet, so we add one.

Note that the expected image has black pixel artifacts, which are
another issue (perhaps bug #40158), and would have to be adressed
separately.
 2017-01-22 15:01:01 +01:00
Joe Watkins
55393e26a5
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix intermittent segfault in GD library
 2017-01-22 06:41:07 +00:00
Mitch Hagstrand
e56fe7e5e7
Fix intermittent segfault in GD library 
The gdIOCtx struct should be zero filled with ecalloc.
emalloc does not zero fill the struct.
 2017-01-22 06:40:55 +00:00
Christoph M. Becker
7a2497b2c5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73968: Premature failing of XBM reading
 2017-01-21 13:18:54 +01:00
Christoph M. Becker
f67d599a01 Fix #73968: Premature failing of XBM reading 
We must take into account the line padding, when we're reading XBM
files.

We deliberately ignore the potential integer overflow here, because
that would be caught by gdImageCreate() or even earlier if `bytes==0`,
what happens in libgd00094.phpt which we adapt accordingly.
 2017-01-21 13:04:36 +01:00
Joe Watkins
1ff27053f9
Fix bug #73961 environmental build dependency in hash sha3 source 2017-01-21 07:45:28 +00:00
Anatol Belski
95406c878a Fixed bug #73962 bug with symlink related to cyrillic directory 2017-01-20 23:45:08 +01:00
Joe Watkins
d6feb2edbd
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #73959 - lastInsertId fails to throw an exception in pdsql
 2017-01-20 20:11:49 +00:00
andrewnester
21ac79e94b
Fixed #73959 - lastInsertId fails to throw an exception in pdsql 2017-01-20 20:10:55 +00:00
Remi Collet
7ea7d3d829 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  NEWS
  Fixed bug #73965 DTrace reported as enabled when disabled
 2017-01-20 17:46:24 +01:00
Remi Collet
f81b7df618 Fixed bug #73965 DTrace reported as enabled when disabled 2017-01-20 17:45:15 +01:00
SjonHortensius
631861e1fa
Update comment, incorrect since 224aaf94 
In 224aaf94; the warning was enabled; making the comment above incorrect. I've updated the comment to reflect the current code
 2017-01-19 10:48:54 +00:00
Xinchen Hui
5e09031144 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed another part in ldap (bug #73933)
 2017-01-19 12:23:56 +08:00
Xinchen Hui
cad2598fcb Fixed another part in ldap (bug #73933) 2017-01-19 12:23:23 +08:00
Joe Watkins
6d89640d55
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73949 leak in mysqli_fetch_object
 2017-01-18 18:23:59 +00:00
Joe Watkins
f9226f9bf3
Fix bug #73949 leak in mysqli_fetch_object 2017-01-18 18:22:57 +00:00
Joe Watkins
bce548d8e6
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
 2017-01-18 17:23:29 +00:00
Marcus Bointon
280e9cb28d
DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850 2017-01-18 17:23:08 +00:00
Leigh
85589ca660 Add php_openssl_store_errors to bailouts 2017-01-18 15:02:52 +00:00
Leigh
d2f07edf71 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-18 14:47:49 +00:00
Leigh
e7e96fe2e0 Change free to OPENSSL_free 2017-01-18 14:45:41 +00:00
Remi Collet
2ce8a4cf87 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  NEWS
  Fix #73956 Link use CC instead of CXX
 2017-01-18 13:02:19 +01:00
Remi Collet
6af22d0d3e Fix #73956 Link use CC instead of CXX 2017-01-18 13:00:49 +01:00
Thomas Punt
9977bdf9b3
Remove more TSRMLS_CC macros 2017-01-18 10:00:15 +00:00
Joe Watkins
43612e9593
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix ce comparison
 2017-01-18 05:06:07 +00:00
Thomas Punt
a22f181736
Fix ce comparison 2017-01-18 05:05:53 +00:00
Anatol Belski
cea050b8da Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73869: Signed Integer Overflow gd_io.c
  Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
 2017-01-17 09:35:26 +01:00
Anatol Belski
5d07438cb3 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #73869: Signed Integer Overflow gd_io.c
  Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
 2017-01-17 09:33:51 +01:00
Christoph M. Becker
d2274b01cb Fix #73869: Signed Integer Overflow gd_io.c 
GD2 stores the number of horizontal and vertical chunks as words (i.e. 2
byte unsigned). These values are multiplied and assigned to an int when
reading the image, what can cause integer overflows. We have to avoid
that, and also make sure that either chunk count is actually greater
than zero. If illegal chunk counts are detected, we bail out from
reading the image.

(cherry picked from commit 5b5d9db3988b829e0b121b74bb3947f01c2796a1)
 2017-01-17 09:30:58 +01:00
Christoph M. Becker
f1b2afc9d9 Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx() 
We must not pretend that there are image data if there are none. Instead
we fail reading the image file gracefully.

(cherry picked from commit cdb648dc4115ce0722f3cc75e6a65115fc0e56ab)
 2017-01-17 09:30:43 +01:00
Xinchen Hui
e180e45a18 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
 2017-01-17 15:35:06 +08:00
Xinchen Hui
b28c2e20ca Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache) 2017-01-17 15:34:19 +08:00
Stanislav Malyshev
05f2f730e6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73648 - integer overflow in substr
 2017-01-16 12:14:03 -08:00
Stanislav Malyshev
d1d002fc4d Fix bug #73648 - integer overflow in substr 2017-01-16 12:11:50 -08:00
Nikita Popov
29433f9fd5 Make unserialize() ref unwrapping compatible with 7.0 
Also fix output difference in merged test (unrelated).
 2017-01-16 14:25:58 +01:00
Nikita Popov
590ef15f6a Merge branch 'PHP-7.0' into PHP-7.1 2017-01-16 14:12:10 +01:00
Nikita Popov
e0ca519a8b Merge branch 'PHP-5.6' into PHP-7.0 2017-01-16 14:11:41 +01:00
Nikita Popov
6477bb724e Add additional serialize tests for fixed bugs 
These have been fixed as a side-effect of the delayed __wakeup
patch.
 2017-01-16 13:24:13 +01:00
Stanislav Malyshev
34d6b63501 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73634 - grapheme_strpos illegal memory access
  Fix typo
 2017-01-16 01:18:50 -08:00
Stanislav Malyshev
8c44d07fd4 Fix bug #73634 - grapheme_strpos illegal memory access 2017-01-16 01:18:16 -08:00
Stanislav Malyshev
50b38322b9 Fix typo 2017-01-16 00:23:06 -08:00
Joe Watkins
bac4c97602
Fix bug #73939 memory allocation in signal handler when HAVE_STRUCT_SIGINFO_T 2017-01-16 04:32:27 +00:00
Joe Watkins
d11bed5909
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add test ini_set with invalid time zone
 2017-01-16 04:13:26 +00:00
Niklas Keller
cc9893eb44
Add test ini_set with invalid time zone 
Wasn't covered before according to gcov.php.net.
 2017-01-16 04:13:01 +00:00
Stanislav Malyshev
ca6f679417 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test
 2017-01-15 18:42:44 -08:00
Stanislav Malyshev
2c7909697a Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix test
 2017-01-15 18:42:33 -08:00
Stanislav Malyshev
814966ad33 Fix test 2017-01-15 18:42:22 -08:00
Stanislav Malyshev
19e80ef496 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update more functions with path check
 2017-01-15 17:32:37 -08:00
Stanislav Malyshev
43d0f2abc5 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Update more functions with path check
 2017-01-15 17:32:26 -08:00
Stanislav Malyshev
0ab1af7d3e Update more functions with path check 2017-01-15 17:31:08 -08:00
Anatol Belski
bd0569e287 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix AppVeyor failures with Opcache enabled
 2017-01-15 21:18:48 +01:00
Anatol Belski
4f19bb7af6 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.
 2017-01-15 21:13:15 +01:00
Nikita Popov
6674f81027 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-14 14:13:42 +01:00
Yordan Gigov
60aff0bd30 Fixed bug #69993 2017-01-14 14:13:15 +01:00
Tom Sommer
e77a1dbe40 Fix bug #69061 
Make mail.log append correct PHP_EOL and remove timestamp when
sending to syslog.
 2017-01-14 13:53:09 +01:00
Andrey Andreev
4bf7ef0806 Add hash_hkdf() 2017-01-14 13:28:21 +01:00
Joe Watkins
687b02789e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Added test for "opcache: print restart reason" to basic_logging.phpt
 2017-01-14 07:33:08 +00:00
Mitch Hagstrand
fbf655afbd
Added test for "opcache: print restart reason" to basic_logging.phpt 2017-01-14 07:32:55 +00:00
Alexander Polyakov
a4accc0e3e
opcache: print restart reason 2017-01-13 21:34:11 +00:00
Alexander Polyakov
d79b82d8ae
opcache: print restart reason 2017-01-13 21:33:58 +00:00
Anatol Belski
929819aaac Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix remaining tests for Opcache runs
 2017-01-13 17:21:01 +01:00
Anatol Belski
aaaef22db6 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.
 2017-01-13 17:16:15 +01:00
Anatol Belski
a7b20894e5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  ensure the end path wouldn't contain double slashes
 2017-01-13 16:54:10 +01:00
Anatol Belski
8e993b427c ensure the end path wouldn't contain double slashes 2017-01-13 16:50:05 +01:00
Anatol Belski
2ae5f2d1a5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  templatize the resource number
 2017-01-13 15:48:33 +01:00
Anatol Belski
3500262b7d templatize the resource number 2017-01-13 15:45:35 +01:00
Anatol Belski
e7c3f44958 refix test 2017-01-13 15:31:10 +01:00
Anatol Belski
8d1aab2aee 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.
 2017-01-13 14:40:31 +01:00
Joe Watkins
19363de12f
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability
 2017-01-13 06:45:17 +00:00
Mitch Hagstrand
fd92b91188
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
 2017-01-13 06:45:04 +00:00
Nikita Popov
da5e09ad03 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-12 21:15:57 +01:00
rfussenegger
bd75f9e613 Fix bug #69899 2017-01-12 21:13:39 +01:00
Leigh
4f7b498d12 Fixed bug #73374 
Add "0b" prefix detection to intval($str, 0). The implementation
is relatively complicated because we need to handle whitespace and
sign.
 2017-01-12 18:53:28 +01:00
Joe Watkins
b2782c6dc5
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
 2017-01-11 08:12:51 +00:00
Joe Watkins
6d797630ab
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
 2017-01-11 08:12:40 +00:00
Joe Watkins
d5553b97d2
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #71219 configure script incorrectly checks for ttyname_r
 2017-01-11 08:10:47 +00:00
Joe Watkins
51d487786c
Fixed bug #71219 configure script incorrectly checks for ttyname_r 2017-01-11 08:09:10 +00:00
Nikita Popov
5999874886 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-10 23:44:45 +01:00
Robrecht Plaisier
d9cd2876d9 Fixed bug #67707 IV not needed for ECB encryption mode, but it returns a warning 2017-01-10 23:42:44 +01:00
Nikita Popov
908ad3cc80 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-10 23:29:43 +01:00
Arnout Boks
13edec75a3 Fixed #73907 (nextSibling property not included in var_dump of DOMNode) 2017-01-10 23:29:02 +01:00
Nikita Popov
79c0cef8ca Merge branch 'PHP-7.0' into PHP-7.1 2017-01-10 23:25:07 +01:00
Arnout Boks
07340553a5 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
 2017-01-10 23:24:34 +01:00
Nikita Popov
d1bb306530 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-10 23:19:30 +01:00
Nikita Popov
291e3f0762 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-10 23:19:19 +01:00
Mitch Hagstrand
ad9c552b12 Fix glob-wrapper.phpt to not fail in Windows 2017-01-10 23:18:52 +01:00
Rasmus Lerdorf
c7ef178e86 Set a session path for this test 2017-01-10 15:18:26 -05:00
Christoph M. Becker
fc46003666 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
 2017-01-10 20:13:16 +01:00
Christoph M. Becker
15837bab8c Fix #73893: A hidden danger of death cycle in a function of gd 
We remove the unused, but potentially dangerous functions.
 2017-01-10 19:52:06 +01:00
Rasmus Lerdorf
9fce263f3b Missing %s 2017-01-10 13:50:49 -05:00
Joe Watkins
3c23d1b6d5
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  pull-request/1807: 	test for dns_get_record
 2017-01-10 13:56:49 +00:00
marcosptf
dcaed51ba0
pull-request/1807: 
test for dns_get_record
 2017-01-10 13:55:31 +00:00
Sara Golemon
005ba2001d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix open_basedir check for glob:// opendir wrapper
 2017-01-09 16:08:08 -08:00
Sara Golemon
69fbe3a9ad Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix open_basedir check for glob:// opendir wrapper
 2017-01-09 16:07:33 -08:00
Nikita Popov
9cc34c4e3e Merge branch 'PHP-7.0' into PHP-7.1 2017-01-10 00:09:02 +01:00
Nikita Popov
69058f35f8 Un-XFAIL serialization test 2017-01-10 00:07:38 +01:00
Nikita Popov
aab3f784d0 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-09 23:29:33 +01:00
Leigh
14c72cc582 Fix check for linux getrandom syscall 2017-01-09 23:29:07 +01:00
Sara Golemon
7e49e8e797 Fix open_basedir check for glob:// opendir wrapper 
php_check_open_basedir() expects a local filesystem path,
but we're handing it a `glob://...` URI instead.

Move the check to after the path trim so that we're checking
a meaningful pathspec.
 2017-01-09 11:02:50 -08:00
Joe Watkins
28f2959b83
Revert "set more suitable defaults for opcache in ini and code" 
This reverts commit b655f2d632.

This has been deemed unsuitable for 7.0
 2017-01-09 17:08:07 +00:00
Dmitry Stogov
5753a753c7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73896 (spl_autoload() crashes when calls magic _call())
 2017-01-09 15:12:22 +03:00
Dmitry Stogov
4f1b24d974 Fixed bug #73896 (spl_autoload() crashes when calls magic _call()) 2017-01-09 15:11:33 +03:00
Joe Watkins
71fe529afc
merge PR #2290: enable opcache in CLI in 7.1+ 2017-01-09 11:00:05 +00:00
Joe Watkins
9727e37cae
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  set more suitable defaults for opcache in ini and code
 2017-01-09 10:56:54 +00:00
Joe Watkins
63e08cbef7
Merge branch 'pull-request/2291' into PHP-7.0 
* pull-request/2291:
  set more suitable defaults for opcache in ini and code
 2017-01-09 10:54:57 +00:00
Markus Staab
b655f2d632
set more suitable defaults for opcache in ini and code 2017-01-09 10:53:23 +00:00
Xinchen Hui
697809d425 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
 2017-01-09 16:30:48 +08:00
Xinchen Hui
f7cb79431f Fixed bug #73854 (Always true condition in php_openssl_sockop_io) 2017-01-09 16:30:00 +08:00
Joe Watkins
bf6eb65673
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #72979 money_format stores wrong length on AIX
 2017-01-09 05:32:50 +00:00
Joe Watkins
8dd523a216
Fixed bug #72979 money_format stores wrong length on AIX 2017-01-09 05:31:41 +00:00
Joe Watkins
0738a78c59
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update ip2long_varation2 test to skip for AIX, see bug #72973
 2017-01-09 05:25:17 +00:00
Joe Watkins
8c653c163a
update ip2long_varation2 test to skip for AIX, see bug #72973 2017-01-09 05:24:44 +00:00
Joe Watkins
c39f71ba9f
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #72974 imap is undefined service on AIX
 2017-01-09 05:15:34 +00:00
Joe Watkins
b8215c0817
Fixed #72974 imap is undefined service on AIX 2017-01-09 05:15:21 +00:00
Joe Watkins
3b8dc330bf
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix FTP tests for Travis CI.
 2017-01-09 00:36:57 +00:00
Mitch Hagstrand
47007455dc
Fix FTP tests for Travis CI. 
This suppresses the errors from stream_socket_server() until
server.inc will not make anymore attempts.
 2017-01-09 00:36:39 +00:00
Nikita Popov
b38e6a54cf Merge branch 'PHP-7.0' into PHP-7.1 2017-01-08 13:48:48 +01:00
Nikita Popov
b36f4ac708 deflate_add(): Don't add unnecessary +1 to size 
zend_string_realloc will do this by itself.
 2017-01-08 13:47:20 +01:00
Anatol Belski
43b92ed5a8 move various places to the centralized OpenSSL setup routine 2017-01-08 00:25:47 +01:00
Anatol Belski
bf14ecc0d8 use the new API for opaque symbol in OpenSSL 1.1.x 2017-01-08 00:25:46 +01:00
Anatol Belski
df1e1fdcb9 implement basic config support for OpenSSL 1.1.x 2017-01-08 00:25:46 +01:00
Nikita Popov
ac46909162 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-08 00:02:33 +01:00
Nikita Popov
ec1b7b933d Fix OOB read introduced by previous commit 
Ooops...
 2017-01-08 00:01:05 +01:00
Nikita Popov
d48ff0f3f5 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-07 23:55:48 +01:00
Rowan Collins
5146d9f8ac http_fopen_wrapper.c - Handle HTTP headers with varying white space 
The stream handler assumed all HTTP headers contained exactly one space,
but the standard says there may be zero or more. Should fix Bug #47021,
and any other edge cases caused by a web server sending unusual spacing,
e.g. the MIME type discovered from Content-Type: can no longer contain
leading whitespace.

We strip trailing whitespace from the headers added into
$http_response_header as well.
 2017-01-07 23:54:57 +01:00
Joe Watkins
201e56cd04
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Adapts the readme to the new test-possibility
 2017-01-07 16:46:01 +00:00
Andreas Heigl
fc777296bf
Adapts the readme to the new test-possibility 
This commit introduces a way to use a vagrant setup to test against a
known LDAP without the need to setup an LDAP on your own machine
 2017-01-07 16:45:10 +00:00
Anatol Belski
901a551bda Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Implement github PR #1736
 2017-01-07 15:40:00 +01:00
Anatol Belski
486fc0424a Implement github PR #1736 
This fixes leak issues on *BSD systems, as described in the PR.
 2017-01-07 15:36:14 +01:00
Joe Watkins
5ae45ef993
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix memleaks from #1755 and some pre-existing ones
 2017-01-07 10:15:15 +00:00
Joe Watkins
b351ec8baf
Merge branch 'pull-request/2283' into PHP-7.0 
* pull-request/2283:
  Fix memleaks from #1755 and some pre-existing ones
 2017-01-07 10:14:36 +00:00
Leigh
21f287915c Remove superfluous variable reinit 2017-01-07 09:43:05 +00:00
Joe Watkins
58273f631b
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  PR #2211 don't supress warnings in tests
 2017-01-07 08:08:09 +00:00
Craig Duncan
98c2cd4311
PR #2211 don't supress warnings in tests 2017-01-07 08:06:38 +00:00
Joe Watkins
f60ebd13b3
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixes for session and fpm tests in PHP7.0 branch
 2017-01-07 07:10:46 +00:00
Mitch Hagstrand
3401f553b9 Fixes for session and fpm tests in PHP7.0 branch 
1. Increased the timeout on sapi/fpm tests to match the cli server
2. Disabled session GC in session_set_save_handler_basic.phpt
3. Fixed GC in save_handler.inc to delete files based on age
 2017-01-06 19:55:57 -08:00
Anatol Belski
f7bb3b5cbd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
 2017-01-07 02:05:37 +01:00
Mitch Hagstrand
4568618030 Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1 
This reverts commit e55e93a1e3.
This change should only apply to master. Not PHP-7.0 or PHP-7.1
 2017-01-07 02:04:03 +01:00
Anatol Belski
0f410f8087 Fixed bug #73877 readlink() returns garbage for UTF-8 paths 2017-01-07 01:09:17 +01:00
Anatol Belski
847e1f97da Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Return integer field types as native integers instead of strings
 2017-01-06 18:12:52 +01:00
Dorin Marcoci
826122fa8e Return integer field types as native integers instead of strings 
Use another define for better compatibility

Test case for #72583 Feature. Small optimisations.

Adjust conditional directives according to coding standards

Add more compatibility for "end of line" on multiple environements

Updated execute.phpt test after switching to integer mapping
 2017-01-06 17:43:46 +01:00
Joe Watkins
c50f61b9b0
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Test request47456.phpt for PR 1303
 2017-01-06 16:22:58 +00:00
Mitch Hagstrand
e55e93a1e3
Test request47456.phpt for PR 1303 
After merging PR 1303 unmatched subpatterns are set to NULL
 2017-01-06 16:22:11 +00:00
Leigh
62e9e1fecd Some commentary, change free method 2017-01-06 15:49:15 +00:00
Leigh
9a0dac124e Conditionally free depending on how assignment happened 2017-01-06 15:24:37 +00:00
Leigh
053b966134 Fix memleaks from #1755 and some pre-existing ones 2017-01-06 14:58:54 +00:00
Christoph M. Becker
cc75e8bca5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #70103: Fix bug 70103 when ZTS is enabled
 2017-01-06 15:44:31 +01:00
Mitch Hagstrand
ad08aa3956 Fix #70103: Fix bug 70103 when ZTS is enabled 
Used snprintf to copy the basename string before it is freed
 2017-01-06 15:26:17 +01:00
Joe Watkins
ba0751a915
Merge branch 'pull-request/1809' 
* pull-request/1809:
  test for function curl_multi_info_read();
 2017-01-06 08:06:38 +00:00
Joe Watkins
3d50172e9e
Merge branch 'pull-request/1809' 
* pull-request/1809:
  test for function curl_multi_info_read();
 2017-01-06 08:06:10 +00:00
Joe Watkins
2d42423953
Merge branch 'pull-request/1755' 
* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
 2017-01-06 07:43:59 +00:00
Joe Watkins
0884cffb67
Merge branch 'pull-request/1755' 
* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
 2017-01-06 07:42:57 +00:00
Joe Watkins
1c40eaaee4
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  add stream_socket_sendto test from PR #1804
 2017-01-06 07:28:56 +00:00
Joe Watkins
3a79f35fdc
add stream_socket_sendto test from PR #1804 2017-01-06 07:27:31 +00:00
Joe Watkins
e86d355c4c
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #69442 closing of fd incorrect when PTS enabled
 2017-01-06 06:58:56 +00:00
Joe Watkins
ff6b309c6f
Merge branch 'pull-request/1588' into PHP-7.0 
* pull-request/1588:
  Fixed #69442 closing of fd incorrect when PTS enabled
 2017-01-06 06:56:50 +00:00
Joe Watkins
811dfaa57b
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #69582 session not readable by root in CLI
 2017-01-06 06:07:17 +00:00
Joe Watkins
b0ff9ee688
Merge branch 'pull-request/1360' into PHP-7.0 
* pull-request/1360:
  Fixed bug #69582 session not readable by root in CLI
  news entry for PR #1360
 2017-01-06 06:05:17 +00:00
Joe Watkins
3f89aec716
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR #1430
 2017-01-06 05:40:41 +00:00
Joe Watkins
a49aaf9ab0
Merge branch 'pull-request/1430' into PHP-7.0 
* pull-request/1430:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR 1430
 2017-01-06 05:39:48 +00:00
Remi Collet
db890956ec add skip when json not loaded 2017-01-06 06:23:59 +01:00
Christoph M. Becker
e7ce861def Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #70417: PharData::compress() doesn't close temp file
 2017-01-05 18:51:04 +01:00
Christoph M. Becker
995ecffbb2 Fix #70417: PharData::compress() doesn't close temp file 
According to the comment, it has not been deemed necessary to close compressed
files. However, we don't want to keep unclosed file handles to save ressources.
So we're also closing compressed archives, if they're not aliased.
 2017-01-05 14:12:31 +01:00
Nikita Popov
769e17ce9b Merge branch 'PHP-7.0' into PHP-7.1 2017-01-05 11:38:17 +01:00
Nikita Popov
2022dacb99 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-05 11:38:05 +01:00
Nikita Popov
900b17b15f Fix printf modifier 2017-01-05 11:37:06 +01:00
Nikita Popov
49d90dcc4d Add Z_EXTRA macro 
For use with u2 values which don't deserve a custom macro...
 2017-01-05 00:49:19 +01:00
Nikita Popov
8d8e949369 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-05 00:28:21 +01:00
Nikita Popov
b47c49d7a0 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-05 00:24:25 +01:00
Nikita Popov
f697874e3f Add tests for delayed __wakeup() 2017-01-05 00:21:48 +01:00
Nikita Popov
0426b916df Implement delayed __wakeup 2017-01-05 00:21:48 +01:00
Sammy Kaye Powers
1f620efe3c Update copyright header to 2017 in calendar.c 2017-01-04 11:24:25 -06:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
6550f3ad7e Update copyright header to 2017 in calendar.c 2017-01-04 11:15:47 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Anatol Belski
b15cc7913a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix PDO tests to match SQL standard syntax and pass Firebird tests.
 2017-01-03 17:54:46 +01:00
Dorin Marcoci
e914abff1e Fix PDO tests to match SQL standard syntax and pass Firebird tests. 2017-01-03 17:48:52 +01:00
Nikita Popov
661fad7beb Merge branch 'PHP-7.0' into PHP-7.1 2017-01-03 12:18:33 +01:00
Nikita Popov
b3889d4b20 Fix build 2017-01-03 12:16:35 +01:00
Vince
cfd6e14842 Fix Bug #73462 - Persistent connections don't set $connect_errno 
Persistent connections skipped resetting $connect_error and $connect_errno values
This adds the "clear error" line to persistent connections for consistency
 2017-01-03 12:13:08 +01:00
Joe Watkins
ff4e330eae
Merge branch 'pull-request/1905' 
* pull-request/1905:
   pack()/unpack() for Big Endian float/double and Little Endian float/double
 2017-01-03 10:50:19 +00:00
Joe Watkins
e42a01bcd5
Merge branch 'pull-request/1905' 
* pull-request/1905:
   pack()/unpack() for Big Endian float/double and Little Endian float/double
 2017-01-03 10:49:53 +00:00
Rasmus Lerdorf
19b757dacd Fix opcache test dependencies 2017-01-02 22:30:28 -08:00
Rasmus Lerdorf
608724bfe1 Fix opcache test dependencies 2017-01-02 22:21:12 -08:00
Stanislav Malyshev
b9837dc183 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use correct string release function
 2017-01-02 22:08:42 -08:00
Stanislav Malyshev
68ac602b28 Use correct string release function 2017-01-02 22:08:25 -08:00
Stanislav Malyshev
0f0406a1c9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix error reporting
 2017-01-02 21:59:59 -08:00
Stanislav Malyshev
ea6e54aff3 Fix error reporting 2017-01-02 21:59:44 -08:00
Stanislav Malyshev
ca72faa2c5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73832 - leave the table in a safe state if the size is too big.
  Fix bug #73831 - NULL Pointer Dereference while unserialize php object
 2017-01-02 21:37:06 -08:00
Stanislav Malyshev
a6cdefe043 Merge branch 'PHP-7.0.15' into PHP-7.0 
* PHP-7.0.15:
  Fix #73832 - leave the table in a safe state if the size is too big.
  Fix bug #73831 - NULL Pointer Dereference while unserialize php object
 2017-01-02 21:35:42 -08:00
Stanislav Malyshev
2075fb2b73 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73737 FPE when parsing a tag format
  Fix bug #73773 - Seg fault when loading hostile phar
  Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
  Fix bug #73768 - Memory corruption when loading hostile phar
  Fix int overflows in phar (bug #73764)
 2017-01-02 21:07:01 -08:00
Stanislav Malyshev
7f0de1a138 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #73737 FPE when parsing a tag format
  Fix bug #73773 - Seg fault when loading hostile phar
  Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
  Fix bug #73768 - Memory corruption when loading hostile phar
  Fix int overflows in phar (bug #73764)
 2017-01-02 21:01:35 -08:00
Stanislav Malyshev
fa2125df67 Merge branch 'PHP-5.6.30' into PHP-5.6 
* PHP-5.6.30:
  Fix bug #73737 FPE when parsing a tag format
  Fix bug #73773 - Seg fault when loading hostile phar
  Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
  Fix bug #73768 - Memory corruption when loading hostile phar
  Fix int overflows in phar (bug #73764)
 2017-01-02 20:56:32 -08:00
Nikita Popov
2a4d0a7a0f Fix test after mail.log change 2017-01-03 02:18:00 +01:00
Nikita Popov
a08747bb4c Merge branch 'PHP-7.0' into PHP-7.1 2017-01-03 02:13:04 +01:00
Nikita Popov
e1e5caf9d4 Fix early free 2017-01-03 02:12:28 +01:00
Nikita Popov
43ed89ea31 Fix data_size decrement 
We don't want to decrement the pointer...
 2017-01-02 23:47:30 +01:00
Nikita Popov
737eb060db Merge branch 'PHP-7.0' into PHP-7.1 2017-01-02 23:39:35 +01:00
Nikita Popov
593b6cd0a8 Optimize get_browser() using prefix and contains checks 
Avoid expensive regex compilations by checking for prefix
and contained segments beforehand.
 2017-01-02 23:31:27 +01:00
Nikita Popov
b06fb88cf9 Optimize browscap loading and representation 
Avoid many string duplications, use interning (browscap-local, of
course), reduce pattern size, use more compact key-value
representation, build result array only on demand.
 2017-01-02 23:30:56 +01:00
Nikita Popov
76a1d3f153 Add get_browser() test against larger corpus 
Testing corpus provided by Anatol against current browscap.ini lite.

About 30% of all agents are not recognized by this browscap.ini,
but this should give us decent coverage.
 2017-01-02 23:30:27 +01:00
Mitch Hagstrand
0acaa97a16
Fix for nowait.phpt failing intermittently 
The parent process was releasing the child semaphore
after the child process continued execution. Now
the child semaphore is released before the child
process continues execution.
 2017-01-02 16:45:52 +00:00
Mitch Hagstrand
c019d33267
Fix for nowait.phpt failing intermittently 
The parent process was releasing the child semaphore
after the child process continued execution. Now
the child semaphore is released before the child
process continues execution.
 2017-01-02 16:44:43 +00:00
vanviegen
abba56f605
Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE 
Fixes bug #73800

news entry for PR #2249
 2017-01-02 14:56:41 +00:00
vanviegen
732f67ee6f
Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE 
Fixes bug #73800

news entry for PR #2250
 2017-01-02 14:54:45 +00:00
Joe Watkins
243dff2057
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  news entry for PR #2267
  Fixed #67474 (getElementsByTagNameNS and default namespace)
  Add (failing) testcase for bug #67474
 2017-01-02 11:58:14 +00:00
Arnout Boks
a8955926c2
Fixed #67474 (getElementsByTagNameNS and default namespace) 
This bug was caused by the fact that dom_get_elements_by_tag_name_ns_raw
uses an empty string to filter on the default namespace (as NULL means
'no filter'), whereas in the node itself the default namespace is
signalled by nodep->ns being null.
 2017-01-02 11:56:37 +00:00
Arnout Boks
19c4a2ef19
Add (failing) testcase for bug #67474 2017-01-02 11:56:33 +00:00
Joe Watkins
3e798c4a5f
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src: (146 commits)
  Flush stderr on win32 in cli_log_message
  Fixed bug #73154
  FIx bug #70213
  Fix dom class can't be inherited by the internal class
  Another try at making concat_003 more reliable
  Fix flaky openssl_pkey_new test
  Make Opcache tests using the cli server more reliable
  Revert "Fix #73530: Unsetting result set may reset other result set"
  define php_ap_map_http_request_error function for older httpd only
  add old versions of httpd support
  Disable AppVeyor fast_finish
  Makes the sapi web server and curl tests more reliable
  Fixes the curl tests to be more reliable in Travis CI
  Interpretation of curl_setopt values for boolean parameters
  Fixes #65689. PDO_Firebrid / exec() does not free allocated statement.
  Fix alpn_ctx leaking in openssl
  Fixed bug #73373 (deflate_add does not verify that output was not truncated)
  Fix IS_UNDEF comparisons in opcache
  Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)
  Increase timing quota for small string concat test
  ...
 2017-01-02 09:44:02 +00:00
Mitch Hagstrand
e077735b03
Fix nowait.phpt to no longer depend on sleeping 
In Travis CI the nowait.phpt test sometimes fails because of
the usleep() not being long enough ensure proper
execution order. Instead of depending on sleeping the
test now uses two semaphores to guarantee execution order.
 2017-01-02 09:43:47 +00:00
Joe Watkins
532486569a
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Flush stderr on win32 in cli_log_message
  Fixed bug #73154
 2017-01-02 09:41:44 +00:00
Mitch Hagstrand
b4459af025
Fix nowait.phpt to no longer depend on sleeping 
In Travis CI the nowait.phpt test sometimes fails because of
the usleep() not being long enough ensure proper
execution order. Instead of depending on sleeping the
test now uses two semaphores to guarantee execution order.
 2017-01-02 09:40:46 +00:00
Nikita Popov
a5027d43dd Merge branch 'PHP-7.0' into PHP-7.1 2017-01-01 21:09:27 +01:00
Nikita Popov
935b5cb11e Flush stderr on win32 in cli_log_message 
This allows us to unfork a bunch of tests for Windows.
 2017-01-01 21:09:02 +01:00
Nikita Popov
70ca40d30f Merge branch 'PHP-7.0' into PHP-7.1 2017-01-01 19:26:36 +01:00
Nikita Popov
4877641962 Fixed bug #73154 
The object that is being serialized may be destroyed during the
execution of __sleep(), so operate on a copy instead.
 2017-01-01 19:24:41 +01:00
Joe Watkins
e7d4a8ce8b
Merge branch 'pull-request/1414' into PHP-7.1 
* Add subject to mail.log
 2017-01-01 14:39:35 +00:00
Nikita Popov
878b8f0465 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-01 14:13:29 +01:00
Nikita Popov
9f560baef5 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-01 14:12:26 +01:00
Nikita Popov
a65ad951ad FIx bug #70213 2017-01-01 14:10:49 +01:00
Nikita Popov
2a34042323 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-01 12:20:46 +01:00
dreamszhu
3c977618e1 Fix dom class can't be inherited by the internal class 2017-01-01 12:20:04 +01:00
Nikita Popov
8467c5c9bf Fix year dependent test 2017-01-01 12:15:52 +01:00
Joe Watkins
dbfbe6261d
Revert "Fix dom class can't be inherited by the internal class" 
This reverts commit 705f60e481.
 2017-01-01 06:52:41 +00:00
dreamszhu
705f60e481
Fix dom class can't be inherited by the internal class 2017-01-01 06:48:02 +00:00
Stanislav Malyshev
8d2539fa0f Fix bug #73831 - NULL Pointer Dereference while unserialize php object 2016-12-31 20:14:20 -08:00
Stanislav Malyshev
1cda0d7c2f Fix bug #73737 FPE when parsing a tag format 2016-12-31 19:31:49 -08:00
Stanislav Malyshev
e5246580a8 Fix bug #73773 - Seg fault when loading hostile phar 2016-12-31 18:47:50 -08:00
Nikita Popov
242d924e59 Fix bug #73847 2016-12-31 13:33:21 +01:00
Stanislav Malyshev
16b3003ffc Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data() 2016-12-30 16:59:46 -08:00
Stanislav Malyshev
b28b8b2fee Fix bug #73768 - Memory corruption when loading hostile phar 2016-12-30 15:57:24 -08:00
Stanislav Malyshev
ca46d0acbc Fix int overflows in phar (bug #73764) 2016-12-30 15:39:48 -08:00
Nikita Popov
2497ae031b Don't check for precise length in ecc.phpt 
Again, this can be off by one.
 2016-12-29 22:05:38 +01:00
David Walker
b09c2f899e Fixed bug #73783 
Bug #73783 raises an issue with signal handling when using SIG_IGN.
With PHP7.1 ZEND_SIGNALS is defaulted to on, which will for all
signals set the handler as zend_signal_handler_defer.  This is
problematic for syscalls like sleep(), which will only return when the
requisite number of seconds have elapsed, or, a non-ignored signal is
raised.  In this case we want to SIG_IGN SIGCHLD, however, SIG_IGN is
only stored in the SIGG(handlers) array, and the actual system level
handler is defined.  This prevents proper signal ignoring when requeted.
 2016-12-29 21:18:22 +01:00
Nikita Popov
7746ed9d5f Merge branch 'PHP-7.0' into PHP-7.1 2016-12-29 21:00:14 +01:00
Nikita Popov
78675ebd9a Fix flaky openssl_pkey_new test 
Public key size may vary by one bit... switch to using %d for
key sizes.
 2016-12-29 20:59:28 +01:00
Mitch Hagstrand
d0fcc74110 Make Opcache tests using the cli server more reliable 
Same fix already applied to ext/curl/tests/server.inc
and sapi/cli/tests/php_cli_server.inc

1. Increases the amount of time for the PHP built-in server to accept a connection
2. Outputs an error if the PHP built-in server fails
 2016-12-29 20:56:45 +01:00
Christoph M. Becker
f4d884dc6e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Fix #73530: Unsetting result set may reset other result set"
 2016-12-29 13:54:11 +01:00
Christoph M. Becker
88d1a2c5aa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Revert "Fix #73530: Unsetting result set may reset other result set"

# Conflicts:
#	ext/sqlite3/sqlite3.c
 2016-12-29 13:47:28 +01:00
Christoph M. Becker
2ba3b27594 Revert "Fix #73530: Unsetting result set may reset other result set" 
This reverts commit eb570294a2.

That commit caused a regression, so it's probably best to revert it, and
to tackle the issue for the next minor release.
 2016-12-29 12:59:04 +01:00
Nikita Popov
937115f8c5 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-27 21:52:33 +01:00
Mitch Hagstrand
2d51267c07 Makes the sapi web server and curl tests more reliable 
1. Increased the time for the sapi/cli/tests/php_cli_server.inc to accept connections.
2. sapi/cli/tests/php_cli_server.inc has errors messages and a `stop` function.
3. bug67429.phpt uses the `stop` function to shutdown the webserver before starting a new one.
4. Removed ext/curl/tests/bug48203_multi-win32.phpt test now that ext/curl/tests/bug48203_multi.phpt
   runs on Windows also.
 2016-12-27 21:52:05 +01:00