Anatol Belski
a7754286d2
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Add test for bug #76942
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
2018-10-05 22:52:53 +02:00
Anatol Belski
c2a956de6f
Add test for bug #76942
2018-10-05 22:51:58 +02:00
Anatol Belski
534684d104
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
...
ref bug #74484
2018-10-05 22:50:34 +02:00
Nikita Popov
fde2ae3721
Merge branch 'PHP-7.1' into PHP-7.2
2018-10-05 18:41:28 +02:00
Manuel Mausz
bb4a2e8bb7
Fix #76972 : FTP data truncation due to forceful ssl socket shutdown
...
Do a correct bidirectional shutdown instead
2018-10-05 18:40:50 +02:00
Anatol Belski
42b769b9e2
Update NEWS [ci skip]
2018-10-03 18:49:52 +02:00
Anatol Belski
31a293f885
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update NEWS [ci skip]
2018-10-03 18:49:13 +02:00
Anatol Belski
abfda3de99
Update NEWS [ci skip]
2018-10-03 18:48:40 +02:00
Anatol Belski
b8cfa09657
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Avoid code duplication and don't miss env restore
2018-10-03 14:34:08 +02:00
Anatol Belski
044eb39e63
Avoid code duplication and don't miss env restore
2018-10-03 14:32:52 +02:00
Remi Collet
da05b7e81e
bump zip extension version
2018-10-03 12:59:01 +02:00
Anatol Belski
dc48e01a19
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
2018-10-03 12:13:22 +02:00
Anatol Belski
b0547a3dfb
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
2018-10-03 12:11:43 +02:00
Nikita Popov
54aa76167b
Merge branch 'PHP-7.1' into PHP-7.2
2018-10-03 10:50:16 +02:00
Nikita Popov
945f315506
Reflection: Copy invoke function also in the variadic case
...
It doesn't matter how the parameters are provided, we always have
to copy the trampoline invoke function.
2018-10-03 10:48:42 +02:00
Nikita Popov
f0647edd88
Fixed bug #66430
2018-10-02 18:19:53 +02:00
Nikita Popov
d2477b284b
Fixed bug #76936
2018-10-02 17:47:07 +02:00
Nikita Popov
56d1578515
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-30 20:07:44 +02:00
Nikita Popov
db80e0e2ad
Fixed bug #75479
...
Wrap the zend_signal_init() call, so the hook arguments line up.
2018-09-30 20:07:15 +02:00
James Titcumb
950c338f80
Fix reflection arguments for sodium_memzero function
2018-09-29 21:19:42 +02:00
Nikita Popov
8e7dfc6ddf
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-28 19:17:29 +02:00
Nikita Popov
83e2b9e220
Fixed bug #76946
2018-09-28 19:15:19 +02:00
Sara Golemon
fed09a23b7
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Bump versions for 7.1.24-dev
2018-09-28 11:32:41 -04:00
Sara Golemon
69c1b619c9
Bump versions for 7.1.24-dev
2018-09-28 11:31:22 -04:00
Nikita Popov
99eb4b2ea4
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-28 13:41:06 +02:00
Nikita Popov
fa84b8ebb4
Fix test for release builds
2018-09-28 13:40:58 +02:00
Nikita Popov
1c35357b31
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-28 12:57:55 +02:00
Nikita Popov
45cdcb2d0b
Fixed bug #76846
2018-09-28 12:56:47 +02:00
Sara Golemon
5f29e3fb6e
Bump version
2018-09-25 16:39:25 -04:00
Sara Golemon
4baf4964ad
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #76918 Repeated parameter name in arg info
2018-09-25 12:09:38 -04:00
Sara Golemon
b5d0eb44c0
Fixed bug #76918 Repeated parameter name in arg info
2018-09-25 11:18:24 -04:00
Christopher Jones
682d0f8325
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 20:53:11 +10:00
Christopher Jones
9e56a3373e
Terminate smart string correctly
...
This is related to Zend VM regression bug #75881 . The regression was fixed in the VM, so there is no user visible change from the termination correction.
2018-09-24 20:52:58 +10:00
Christopher Jones
4ba1fc0a11
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 20:06:05 +10:00
Christopher Jones
91954c24da
Make usable for PECL OCI8 release for PHP 7.x
2018-09-24 20:05:54 +10:00
Christopher Jones
28b89afca1
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 17:06:59 +10:00
Christopher Jones
57eb25b393
Backport master branch comment typo fix
2018-09-24 17:06:29 +10:00
Christopher Jones
d7b060e995
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 17:01:20 +10:00
Christopher Jones
3d497f884f
Make tests portable across PHP 7.x versions
2018-09-24 17:01:13 +10:00
Christopher Jones
a370e7d0ad
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 16:52:26 +10:00
Christopher Jones
338802b543
Remove $id from phpinfo as already done in PHP-7.3
2018-09-24 16:52:17 +10:00
Christopher Jones
fc296a27db
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 16:38:47 +10:00
Christopher Jones
37652336c7
And strip trailing tabs too...
2018-09-24 16:38:39 +10:00
Christopher Jones
d2b04c1749
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 16:00:04 +10:00
Christopher Jones
bdd67d8175
Sync EXPECT usage with PHP-7.3
2018-09-24 15:59:52 +10:00
Christopher Jones
f396d297aa
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 13:27:35 +10:00
Christopher Jones
a2c0f8722b
Remove trailing whitespace to help keep branches in sync
2018-09-24 13:27:27 +10:00
Christopher Jones
f68662f63f
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 09:56:53 +10:00
Christopher Jones
eceb34073b
Remove trailing whitespace to help keep branches in sycn
2018-09-24 09:37:46 +10:00
Christoph M. Becker
7c2cc9aa56
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #66828 : iconv_mime_encode Q-encoding longer than it should be
2018-09-22 15:31:02 +02:00