Nikita Popov
d6f70f0ee3
Disable block pass for large functions
...
(Backport of 7ea261685f
to 7.0.)
2017-03-28 22:07:37 +02:00
Anatol Belski
6508320936
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
deps updated, cherry-pick 88642decf9
add test for bug #74230
2017-03-27 19:42:24 +02:00
Anatol Belski
ee8b5de5a0
deps updated, cherry-pick 88642decf9
2017-03-27 19:38:20 +02:00
Anatol Belski
6da475367a
add test for bug #74230
2017-03-27 19:33:51 +02:00
x-xiang
e9e860a05b
Don't retain mt_rand() seeds across requests
...
In particular, this prevents manual seeding of mt_rand() to leak
across requests.
2017-03-27 19:02:39 +02:00
Derick Rethans
727b21c839
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-27 18:01:30 +01:00
Derick Rethans
1f8fc0fb56
Forgot to update the output in the test too
2017-03-27 18:01:22 +01:00
Derick Rethans
f326cfc513
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-27 11:28:35 +01:00
Derick Rethans
eb5d4bcd4f
Fixed test for #33415 due to data fixes.
2017-03-27 11:28:16 +01:00
Derick Rethans
1f9e5cc2bc
Updated to version 2017.2 (2017b)
2017-03-24 12:25:26 +00:00
Derick Rethans
eb13003f6c
Updated to version 2017.2 (2017b)
2017-03-24 12:25:25 +00:00
Derick Rethans
ee49d4b4be
Added a test case to make sure microseconds work.
2017-03-24 11:39:32 +00:00
Dmitry Stogov
a0331127fe
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed uninitialized data
2017-03-23 18:59:56 +03:00
Dmitry Stogov
1517fdb36c
Fixed uninitialized data
2017-03-23 18:59:27 +03:00
Anatol Belski
9e3672eaef
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
explicitly ignore php.ini for proc open tests
2017-03-21 12:44:36 +01:00
Anatol Belski
bc2b500d3e
explicitly ignore php.ini for proc open tests
...
In some cases, when an environment is unclean, tests might get stuck fe
when some incorrect ini file is loaded. As the test depends on the core
only, it is safer to explicitly ignore the ini. Any ini can be passed in
the cmd itself, if needed.
2017-03-21 12:39:40 +01:00
Derick Rethans
2b7c3831cd
Fix for #73837 : "new DateTime()" with a cast to double
2017-03-20 17:48:15 +00:00
Jakub Zelenka
7dd52cbcdd
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-20 16:08:16 +00:00
Jakub Zelenka
6d066dc421
Lower timeout in test for but #72333
2017-03-20 16:07:12 +00:00
Nikita Popov
f2c35fdda8
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-17 20:20:43 +01:00
Nikita Popov
2e83082605
Fix bug #74265
2017-03-17 20:19:40 +01:00
Jakub Zelenka
ebc75dab50
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-17 19:08:26 +00:00
Jakub Zelenka
df135ffa7a
Make test 002 for bug #65538 not to use https in cafile
2017-03-17 19:07:32 +00:00
Jakub Zelenka
b0ba8c68cd
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-17 18:12:37 +00:00
Jakub Zelenka
53e2c9158d
Consume data by server in test for bug #72333
...
Client should be able to write more data and prevent time out
2017-03-17 18:11:50 +00:00
Nikita Popov
7ea261685f
Disable block pass for large functions
...
This is the last fix for bug #74250 .
2017-03-17 12:49:20 +01:00
Jakub Zelenka
3becfb9be4
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-16 18:12:54 +00:00
Jakub Zelenka
0c8ad36d92
Make test for bug #72333 a bit more reliable
2017-03-16 18:11:56 +00:00
Sebastian Bergmann
ccc35d1903
Fugbix typo
2017-03-16 19:10:07 +01:00
Nikita Popov
052aa466e1
Further optimize worklist management
...
Instead of always popping the first elements, do multiple complete
iterations of the worklist until it is empty.
2017-03-16 18:11:27 +01:00
Nikita Popov
e60515f3b8
Slightly optimize worklist management
...
Avoid scanning the worklist twice on every iteration.
2017-03-16 17:32:27 +01:00
Nikita Popov
f1f68b60f5
Optimize DJ spanning tree back-edge check
...
Instead of walking the DJ spanning tree upwards, record entry and
exit times during the DFS and use these to determine whether CJ
edges are sp-back edges.
2017-03-16 17:26:20 +01:00
Nikita Popov
6633e8492e
Sort blocks in loop identification
...
The previous implementation was doing O(blocks*levels) iterations,
which for a linear-ish domtree is O(blocks^2). Avoid this by sorting
the blocks by decreasing level upfront.
2017-03-16 16:49:36 +01:00
Nikita Popov
63e59c75a5
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-16 12:57:36 +01:00
Adam Saponara
98f4ce9363
Return FALSE if error_log fails to write all bytes
2017-03-16 12:56:36 +01:00
Nikita Popov
9331be7d6a
Use call_map to avoid linear call lookup
2017-03-16 12:33:57 +01:00
Bob Weinand
f3ab4c1a08
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-15 00:09:42 +01:00
Matt Bonneau
7fba8bda4c
Fixed bug #74240 (deflate_add can allocate too much memory)
2017-03-15 00:08:32 +01:00
Jakub Zelenka
b4f0174e5c
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-14 18:46:29 +00:00
Jakub Zelenka
ba70478a21
Skip bug74159 test for OpenSSL lower than 1.0.1
2017-03-14 18:13:57 +00:00
Jakub Zelenka
8e5d080d54
Tidy up test for bug72333
2017-03-14 18:13:57 +00:00
Jakub Zelenka
f0e67d1a56
Speed up test for bug72333
...
It reliably fails without the xp_ssl.c so it is good with smaller usleep
2017-03-14 18:13:57 +00:00
Jakub Zelenka
411f4b1b6f
Fix indent and add comment
2017-03-14 18:13:57 +00:00
Jakub Zelenka
760ff21bf3
Tidy up setting of SSL_MODE_RELEASE_BUFFERS
2017-03-14 18:13:57 +00:00
Jakub Zelenka
53cc72ef86
Remove extra SSL mode settings
2017-03-14 18:13:57 +00:00
Jakub Zelenka
17e9fc9bfe
Fix bug #72333 (fwrite() on non-blocking SSL sockets does not work)
2017-03-14 18:13:57 +00:00
Remi Collet
1ffb1b9597
rely on provided openssl.cnf to avoid possible failure with system defaults
2017-03-13 08:17:42 +01:00
andrewnester
fbf0e0587f
Implement FR #74217 : deterministic sqlite functions
2017-03-12 17:03:00 +01:00
Xinchen Hui
9f263c257a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74218 (ArrayIterator error message is confusing)
2017-03-10 15:16:01 +08:00
Xinchen Hui
c398198c0a
Fixed bug #74218 (ArrayIterator error message is confusing)
2017-03-10 15:15:31 +08:00
Nikita Popov
314ef0ff69
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-09 17:32:01 +01:00
Thomas Orozco
247ce052cd
Fixed bug #71003 : Add PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
2017-03-09 17:31:21 +01:00
Nikita Popov
6635639b75
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-09 16:45:28 +01:00
mcq8
b224e74267
Fixed bug #72096 Swatch time value incorrect for dates before 1970
2017-03-09 16:44:02 +01:00
andrewnester
8f799137d7
Fixed bug #74058
...
Fall back from get_property_ptr_ptr to read_property if offsetGet
is overridden.
2017-03-09 00:10:00 +01:00
Sara Golemon
1a19b97ac3
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Detect invalid port in xp_socket parse ip address
2017-03-07 12:11:22 -08:00
Sara Golemon
bab0b99f37
Detect invalid port in xp_socket parse ip address
...
For historical reasons, fsockopen() accepts the port and hostname
separately: fsockopen('127.0.0.1', 80)
However, with the introdcution of stream transports in PHP 4.3,
it became possible to include the port in the hostname specifier:
fsockopen('127.0.0.1:80')
Or more formally: fsockopen('tcp://127.0.0.1:80')
Confusing results when these two forms are combined, however.
fsockopen('127.0.0.1:80', 443) results in fsockopen() attempting
to connect to '127.0.0.1:80:443' which any reasonable stack would
consider invalid.
Unfortunately, PHP parses the address looking for the first colon
(with special handling for IPv6, don't worry) and calls atoi()
from there. atoi() in turn, simply stops parsing at the first
non-numeric character and returns the value so far.
The end result is that the explicitly supplied port is treated
as ignored garbage, rather than producing an error.
This diff replaces atoi() with strtol() and inspects the
stop character. If additional "garbage" of any kind is found,
it fails and returns an error.
2017-03-07 12:10:53 -08:00
Dmitry Stogov
d9231b1667
Fixed pointer allignment
2017-03-07 10:18:34 +03:00
Dmitry Stogov
b273a8cbe4
Ensure pointer alignment.
2017-03-07 09:48:18 +03:00
Dmitry Stogov
6158b517c4
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt)
2017-03-03 16:12:41 +03:00
Dmitry Stogov
648b756f35
Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt)
2017-03-03 16:10:46 +03:00
Nikita Popov
bf8c463f5b
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 12:36:13 +01:00
somedaysummer
fab5ce347c
PHP bug #74004
...
Fix for DOMDocument loadHTML and loadHTMLFile ignore LIBXML_NOWARNING
and LIBXML_NOERROR flags.
2017-03-02 12:35:42 +01:00
Derick Rethans
a7ff583e7e
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 11:28:09 +00:00
Derick Rethans
cf60f26da6
Fixed tests after tzdb removed abbreviations
2017-03-02 11:28:02 +00:00
Derick Rethans
61e9b7354f
Make sure we anchor this test to February
2017-03-02 11:27:44 +00:00
Nikita Popov
bc1807dbe2
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 12:13:38 +01:00
Mitch Hagstrand
29333550d2
Fix bug73858.phpt to work in months without 31 days
...
Used hardcoded months in bug73858.phpt rather than the current and previous
month.
2017-03-02 12:13:06 +01:00
Christopher Jones
06e5ec9e32
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 15:33:25 +11:00
Christopher Jones
e80ea04c79
Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated)
...
This was a modification of an incomplete PR #2276 .
2017-03-02 15:28:01 +11:00
Derick Rethans
1b16fb594f
Updated to version 2017.1 (2017a)
2017-03-01 20:07:51 +00:00
Derick Rethans
dfcb11d7d1
Updated to version 2017.1 (2017a)
2017-03-01 20:07:51 +00:00
Remi Collet
2f955d5d0a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
make type consistent with glob_t.gl_pathc
2017-03-01 17:02:42 +01:00
Remi Collet
53a08fd07d
make type consistent with glob_t.gl_pathc
2017-03-01 17:01:58 +01:00
Nikita Popov
f678b0eae2
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-24 23:22:24 +01:00
Grundik
eac8166bd4
Fix bug #73127
...
gost-crypto hash was incorrect if input data contained long 0xFF
sequence, due to a carry-propagation bug.
2017-02-24 23:20:49 +01:00
Aaron Piotrowski
531fbb88f5
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-23 22:56:04 -06:00
Aaron Piotrowski
ff8a6b1232
Update test for bug #74159
2017-02-23 22:24:59 -06:00
Aaron Piotrowski
c05c65ac80
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-23 21:19:46 -06:00
Aaron Piotrowski
e9873d9853
Fix bug #74159
...
Thanks to @brzuchal for the patch to xp_ssl.c and @DaveRandom for helping debug the problem.
2017-02-23 20:59:43 -06:00
Xinchen Hui
be60d159b6
Add test only (bug doesn't exists in 7.1)
2017-02-23 12:47:15 +08:00
Xinchen Hui
330a7b62c3
Fixed bug #74152 (if statement says true to a null variable)
2017-02-23 12:33:17 +08:00
Xinchen Hui
48fcc5ddc2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
2017-02-23 11:02:37 +08:00
Xinchen Hui
1d4eead995
Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
2017-02-23 11:02:23 +08:00
Dmitry Stogov
500232ef35
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
too many dashes
2017-02-21 10:48:21 +03:00
Dmitry Stogov
593a4d8fe9
too many dashes
2017-02-21 10:47:48 +03:00
Dmitry Stogov
508d78ce5e
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
2017-02-21 10:42:42 +03:00
Dmitry Stogov
bd7e5c1548
Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5)
...
Include WSDL cache version number into file name
2017-02-21 10:41:20 +03:00
Remi Collet
dd9701c414
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix test for libzip 1.2.0
2017-02-19 17:02:16 +01:00
Remi Collet
c836ad1c7e
fix test for libzip 1.2.0
2017-02-19 17:02:00 +01:00
andrewnester
15b8b124ae
Fixed #74099 - Memory leak with openssl_encrypt()
2017-02-17 21:23:16 +01:00
Nikita Popov
c240feb7f4
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-17 18:44:02 +01:00
Benjamin Robin
513582814b
Fixed bug #74105
...
If getrandom syscall is unavailable (ENOSYS), try to fallback on
/dev/urandom.
2017-02-17 18:42:35 +01:00
Nikita Popov
976225ef23
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-16 17:28:05 +01:00
Nikita Popov
cf3ef36323
Fix memory errors in url rewriter
...
Strings aren't terminated here...
2017-02-16 17:24:07 +01:00
Nikita Popov
a381b61f03
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-16 17:00:21 +01:00
Nikita Popov
708973c9bd
Fix autoload_func_info destruction
...
Can't reference the function ptr after the closure has been
destroyed.
2017-02-16 16:59:17 +01:00
Nikita Popov
f741f9b656
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-16 12:47:12 +01:00
Mitch Hagstrand
3b91ed112f
Make the ftp and stream tests more reliable.
...
The tests can sometimes fail because it chooses a passive port for ftp that
is already in use. This makes the test attempt multiple times to find a free
port.
2017-02-16 12:46:55 +01:00
Nikita Popov
5432d6f982
Add json dep to test
2017-02-16 12:45:24 +01:00