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
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