Nikita Popov
d3aac6f810
Merge branch 'PHP-7.1'
2017-03-17 12:54:11 +01: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
37da80bf19
Merge branch 'PHP-7.1'
2017-03-16 18:13:37 +00: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
6d748b43ae
Merge branch 'PHP-7.1'
2017-03-16 19:10:23 +01:00
Sebastian Bergmann
ccc35d1903
Fugbix typo
2017-03-16 19:10:07 +01:00
Nikita Popov
7ea854b1df
Merge branch 'PHP-7.1'
2017-03-16 18:15:13 +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
69dc088c36
Merge branch 'PHP-7.1'
2017-03-16 17:40:33 +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
8015daeddb
Merge branch 'PHP-7.1'
2017-03-16 12:57:43 +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
da223b9500
Merge branch 'PHP-7.1'
2017-03-16 12:34:36 +01:00
Nikita Popov
9331be7d6a
Use call_map to avoid linear call lookup
2017-03-16 12:33:57 +01:00
Thomas Punt
932c4b35dc
Remove more unnecessary checks on Zend's allocator functions
2017-03-16 12:23:55 +01:00
Thomas Punt
9d9defa29a
Remove dead code from BCMath extension
2017-03-16 12:23:55 +01:00
Anatol Belski
c9472cbd16
fix shared compilation
2017-03-15 11:43:20 +01:00
Bob Weinand
8a7a1411b9
Merge branch 'PHP-7.1'
2017-03-15 00:09:59 +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
117d6a9a14
Merge branch 'PHP-7.1'
2017-03-14 18:47:51 +00:00
Jakub Zelenka
b4f0174e5c
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-14 18:46:29 +00:00
Sara Golemon
131fd3baa0
Remove unnecesary shadow of new_val
2017-03-14 11:29:22 -07:00
Sara Golemon
c74bc87c74
Minor optimizations to array_keys()/array_values()
...
array_values():
When the input is an empty array or a packed array with no gaps,
return the original array.
array_keys():
When the input is an empty array, return the original array.
When the input is a packed array with no holes
(and no search key specified), populate the return with
a simple range(0, count($input) - 1)
2017-03-14 11:23:02 -07: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
Nikita Popov
edcabf6d07
Drop unnecessary allocator return value checks
2017-03-13 22:07:15 +01:00
Remi Collet
196ba4e194
Merge branch 'PHP-7.1'
...
* PHP-7.1:
rely on provided openssl.cnf to avoid possible failure with system defaults
2017-03-13 08:17:59 +01:00
Remi Collet
1ffb1b9597
rely on provided openssl.cnf to avoid possible failure with system defaults
2017-03-13 08:17:42 +01:00
Nikita Popov
1e196110d3
Fix __sleep() returning undefined declared properties
2017-03-12 22:20:08 +01:00
Nikita Popov
ddc0dbf1a3
Clean up __sleep() related code
2017-03-12 22:20:07 +01:00
Nikita Popov
b3ca0c2500
zend-test extension to house code that is required for testing internal APIs, but that we would not want to expose for regular builds
2017-03-12 18:58:50 +00:00
David Carlier
ea91c08232
Drop unnecessary checks of pemalloc() return value
2017-03-12 17:06:25 +01:00
Nikita Popov
e31342ef84
Merge branch 'PHP-7.1'
2017-03-12 17:04:02 +01:00
andrewnester
fbf0e0587f
Implement FR #74217 : deterministic sqlite functions
2017-03-12 17:03:00 +01:00
Xinchen Hui
9ad8e8f8ee
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #74218 (ArrayIterator error message is confusing)
2017-03-10 15:17:29 +08: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
30be110c5a
Merge branch 'PHP-7.1'
2017-03-09 17:32:08 +01: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
