da223b9500
Merge branch 'PHP-7.1'
2017-03-16 12:34:36 +01:00
9331be7d6a
Use call_map to avoid linear call lookup
2017-03-16 12:33:57 +01:00
932c4b35dc
Remove more unnecessary checks on Zend's allocator functions
2017-03-16 12:23:55 +01:00
9d9defa29a
Remove dead code from BCMath extension
2017-03-16 12:23:55 +01:00
c9472cbd16
fix shared compilation
2017-03-15 11:43:20 +01:00
8a7a1411b9
Merge branch 'PHP-7.1'
2017-03-15 00:09:59 +01:00
f3ab4c1a08
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-15 00:09:42 +01:00
7fba8bda4c
Fixed bug #74240 (deflate_add can allocate too much memory)
2017-03-15 00:08:32 +01:00
117d6a9a14
Merge branch 'PHP-7.1'
2017-03-14 18:47:51 +00:00
b4f0174e5c
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-14 18:46:29 +00:00
131fd3baa0
Remove unnecesary shadow of new_val
2017-03-14 11:29:22 -07:00
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
ba70478a21
Skip bug74159 test for OpenSSL lower than 1.0.1
2017-03-14 18:13:57 +00:00
8e5d080d54
Tidy up test for bug72333
2017-03-14 18:13:57 +00:00
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
411f4b1b6f
Fix indent and add comment
2017-03-14 18:13:57 +00:00
760ff21bf3
Tidy up setting of SSL_MODE_RELEASE_BUFFERS
2017-03-14 18:13:57 +00:00
53cc72ef86
Remove extra SSL mode settings
2017-03-14 18:13:57 +00:00
17e9fc9bfe
Fix bug #72333 (fwrite() on non-blocking SSL sockets does not work)
2017-03-14 18:13:57 +00:00
edcabf6d07
Drop unnecessary allocator return value checks
2017-03-13 22:07:15 +01:00
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
1ffb1b9597
rely on provided openssl.cnf to avoid possible failure with system defaults
2017-03-13 08:17:42 +01:00
1e196110d3
Fix __sleep() returning undefined declared properties
2017-03-12 22:20:08 +01:00
ddc0dbf1a3
Clean up __sleep() related code
2017-03-12 22:20:07 +01:00
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
ea91c08232
Drop unnecessary checks of pemalloc() return value
2017-03-12 17:06:25 +01:00
e31342ef84
Merge branch 'PHP-7.1'
2017-03-12 17:04:02 +01:00
fbf0e0587f
Implement FR #74217 : deterministic sqlite functions
2017-03-12 17:03:00 +01:00
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
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
c398198c0a
Fixed bug #74218 (ArrayIterator error message is confusing)
2017-03-10 15:15:31 +08:00
30be110c5a
Merge branch 'PHP-7.1'
2017-03-09 17:32:08 +01:00
314ef0ff69
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-09 17:32:01 +01:00
247ce052cd
Fixed bug #71003 : Add PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
2017-03-09 17:31:21 +01:00
065b3700b6
Merge branch 'PHP-7.1'
2017-03-09 16:45:40 +01:00
6635639b75
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-09 16:45:28 +01:00
b224e74267
Fixed bug #72096 Swatch time value incorrect for dates before 1970
2017-03-09 16:44:02 +01:00
d0c8aba3d8
Pcntl: Make realtime signals available
...
Expose constants SIGRTMIN and SIGRTMAX and adjust range checks to
support realtime signals.
2017-03-09 15:59:09 +01:00
f68968f7e0
Merge branch 'PHP-7.1'
2017-03-09 00:10:31 +01:00
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
2ba2b768cc
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Detect invalid port in xp_socket parse ip address
2017-03-07 12:11:31 -08:00
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
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
fe8112e8f8
drop redundant checks
2017-03-07 15:42:19 +01:00
2cfd64cad8
move to hash API
2017-03-07 13:41:12 +01:00
6a31872307
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed pointer allignment
2017-03-07 10:18:57 +03:00
d9231b1667
Fixed pointer allignment
2017-03-07 10:18:34 +03:00
b273a8cbe4
Ensure pointer alignment.
2017-03-07 09:48:18 +03:00
297e435722
remove accidentially commited file
2017-03-07 01:33:19 +01:00
e113b6784a
Ensure pointer alignment.
2017-03-06 17:09:05 +03:00
Nikita Popov