af7bfc71fd
Merge branch 'PHP-7.0' into PHP-7.1
2017-07-01 11:52:41 +02:00
e3cc15daf2
Fixed bug #74840 (Opcache overwrites argument of GENERATOR_RETURN within finally)
2017-07-01 11:52:03 +02:00
f15790ec73
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed #69356 : PDOStatement::debugDumpParams() truncates query
2017-06-29 11:40:56 +02:00
08089f014c
Fixed #69356 : PDOStatement::debugDumpParams() truncates query
2017-06-29 11:39:50 +02:00
e938cfc921
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-25 20:17:26 +02:00
604827b694
Fixed bug #73173
...
Patch by tloi at fortinet dot com.
2017-06-25 20:17:06 +02:00
44d734254a
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-25 20:13:48 +02:00
0c4f11ecaa
Add more constants, improve comments, and add tests
2017-06-25 20:12:45 +02:00
0c707fcb10
Add OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key padding
...
It fixes bug #71917 (openssl_open() returns junk on envelope < 16 bytes)
and bug #72362 (OpenSSL Blowfish encryption is incorrect for short
keys).
2017-06-25 18:08:50 +01:00
bda0f4e8dc
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-25 15:30:29 +02:00
cd1869bcf2
Remove invalid check of dictionary content and add initialization of dictionary if raw compression used
2017-06-25 10:53:28 +02:00
b714309056
Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content
...
The patch for bug #74720 was incomplete.
2017-06-24 00:18:57 +02:00
5b5a92b8b6
Fixed bug #74623
2017-06-23 17:32:45 +02:00
4948da178a
Make inference robust against infinite loop
...
Right now, if narrowing occurs on non-debug builds, inference can
easily go into an infinite loop. Prevent this, and add a pointer
that this should be reported as a bug.
2017-06-23 17:07:44 +02:00
721de5b542
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-23 13:31:39 +02:00
4d6100569b
Fix error if compiled without -fpermissive flag.
2017-06-23 13:31:23 +02:00
bd8940a1fe
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix method "eof"
2017-06-23 07:53:12 +01:00
b255b97e43
fix method "eof"
...
replace "eof" with "feof"
because:
1) http://php.net/manual/ru/function.feof.php
2) Error: Call to undefined function eof()
2017-06-23 07:53:00 +01:00
c56378b0d5
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix bug #73471 PHP freezes with AppendIterator
2017-06-22 11:57:39 +01:00
81c2a4b9ba
fix bug #73471 PHP freezes with AppendIterator
2017-06-22 11:56:49 +01:00
ed1f64e083
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix bug #74780 parse_url() borken when query string contains colon
2017-06-22 11:52:39 +01:00
db287b2303
fix bug #74780 parse_url() borken when query string contains colon
2017-06-22 11:52:06 +01:00
5d666d2a02
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Add bug #74625 to package.xml
Add IN bind case to bug74625.phpt
Fixed bug #74625 (Integer overflow in oci_bind_array_by_name).
2017-06-21 15:55:54 +10:00
cda87977a5
Add bug #74625 to package.xml
2017-06-21 15:50:51 +10:00
b4c5f20c46
Add IN bind case to bug74625.phpt
2017-06-21 15:47:32 +10:00
fa3615f14e
Fixed bug #74625 (Integer overflow in oci_bind_array_by_name).
2017-06-21 15:44:55 +10:00
13347e8a7d
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-21 15:04:03 +10:00
3fbbcf7f93
Remove use of obsolete create_function()
2017-06-21 15:02:58 +10:00
d9feb3c2d0
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-21 14:29:43 +10:00
1bdc290017
Update OCI8 version test and package.xml
2017-06-21 14:29:30 +10:00
18b6de7a91
Fix bug #73634 - grapheme_strpos illegal memory access
2017-06-20 13:29:57 -07:00
14c422a32f
Fix bug #73648 - integer overflow in substr
2017-06-20 13:29:48 -07:00
67f063e3ac
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Split requested size as expected by CreateFileMapping.
2017-06-20 15:45:05 +02:00
6a854e2740
Split requested size as expected by CreateFileMapping.
...
Thus fixing ext\opcache\tests\log_verbosity_bug.phpt fails on 64-bit.
2017-06-20 15:40:25 +02:00
7ecddd2c24
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-20 16:00:55 +10:00
27d6814351
PDO_OCI: support IC 12.2 in configure option
2017-06-20 16:00:22 +10:00
f39c9d8345
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Bump OCI8 version
2017-06-20 14:55:27 +10:00
64447030bb
Bump OCI8 version
2017-06-20 14:54:45 +10:00
b1431c6174
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
add test for bug #70700
2017-06-20 14:44:11 +10:00
98bcc0bd43
add test for bug #70700
2017-06-20 14:43:20 +10:00
b742a18ba4
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
oci8 - Implementation of Oracle TAF Callback
2017-06-20 14:33:35 +10:00
1b797f7ad3
oci8 - Implementation of Oracle TAF Callback
...
Adds support for the Transparent Application Failover Callback.
The php_oci_connection struct got a char* added which will contain the
callback function, it should be set to PHP_OCI_TAF_DISABLE_CALLBACK at
the end of a php request for permanent connections so that, if a TAF
callback occurs, no userspace function will be called.
Maybe add support for registering object functions (via array),
currently the register function only accepts a string. I didn't know how
to implement it correctly. As a failover occurs very rarely it might be
better to not keep the cache when saving the zend_fcall_info.
Things to do
[ ] config.m4 needs to compile oci8_failover.c
[ ] Check if correctly implemented (especially for multithreading)
[ ] Add support for registering callback function via array
2017-06-20 14:32:52 +10:00
058bec9e33
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
add test for bug #60994
2017-06-20 14:24:07 +10:00
51a7e35c24
add test for bug #60994
2017-06-20 14:22:28 +10:00
fbb884e532
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-18 19:08:51 +01:00
509f5097ab
openssl: Add openssl_pkcs12_(read, export) tests
...
Add basic tests for openssl_pkcs12_read and openssl_pkcs12_export.
openssl_pkcs12_export has two tests disable which currently do not work
as intended and should be fixed.
2017-06-18 19:02:51 +01:00
bfa9362d43
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-18 18:28:54 +01:00
887fabe78f
Regenerate and bump re2c version to 0.16
...
It also matches the re2c version for Zend language scanner
2017-06-18 18:26:48 +01:00
c2a348b5bc
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-16 17:14:23 +01:00
f19dfac830
openssl: Fix spkstr and spki leak in openssl_spki_new
...
spkstr is not free'd when running the test and valgrind reports a leak
of 32,318 bytes. The free condition is not met since keyresource is not
NULL, apart from that OPENSSL_free actually free's the allocated memory
by OPENSSL_malloc inside OpenSSL.
Valgrind reports 768 bytes leaked in openssl_spki_new when running the
testsuite. Remove the keyresource check to always free spki.
2017-06-16 16:51:50 +01:00
Bob Weinand