Commit graph

45697 commits

Author SHA1 Message Date
Christopher Jones
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
Christopher Jones
cda87977a5 Add bug #74625 to package.xml 2017-06-21 15:50:51 +10:00
Christopher Jones
b4c5f20c46 Add IN bind case to bug74625.phpt 2017-06-21 15:47:32 +10:00
Ingmar Runge
fa3615f14e Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). 2017-06-21 15:44:55 +10:00
Christopher Jones
d561aa7cb1 Merge branch 'PHP-7.1' 2017-06-21 15:04:34 +10:00
Christopher Jones
13347e8a7d Merge branch 'PHP-7.0' into PHP-7.1 2017-06-21 15:04:03 +10:00
Christopher Jones
3fbbcf7f93 Remove use of obsolete create_function() 2017-06-21 15:02:58 +10:00
Christopher Jones
78e5811c1a Merge branch 'PHP-7.1' 2017-06-21 14:32:00 +10:00
Christopher Jones
d9feb3c2d0 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-21 14:29:43 +10:00
Christopher Jones
1bdc290017 Update OCI8 version test and package.xml 2017-06-21 14:29:30 +10:00
Stanislav Malyshev
18b6de7a91 Fix bug #73634 - grapheme_strpos illegal memory access 2017-06-20 13:29:57 -07:00
Stanislav Malyshev
14c422a32f Fix bug #73648 - integer overflow in substr 2017-06-20 13:29:48 -07:00
Anatol Belski
3fc1993cfc Merge branch 'PHP-7.1'
* PHP-7.1:
  Split requested size as expected by CreateFileMapping.
2017-06-20 15:45:34 +02:00
Anatol Belski
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
Anatol Belski
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
Christopher Jones
52e5406e87 Fixed Bug #74537 (Align --with-pdo-oci configure option with --with-oci8 syntax) 2017-06-20 16:24:38 +10:00
Christopher Jones
7ecddd2c24 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-20 16:00:55 +10:00
Christopher Jones
27d6814351 PDO_OCI: support IC 12.2 in configure option 2017-06-20 16:00:22 +10:00
Christopher Jones
f42e1c6f38 Merge branch 'PHP-7.1'
* PHP-7.1:
  Bump OCI8 version
2017-06-20 14:56:22 +10:00
Christopher Jones
f39c9d8345 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Bump OCI8 version
2017-06-20 14:55:27 +10:00
Christopher Jones
64447030bb Bump OCI8 version 2017-06-20 14:54:45 +10:00
Christopher Jones
1936a6e3aa Merge branch 'PHP-7.1'
* PHP-7.1:
  add test for bug #70700
2017-06-20 14:44:46 +10:00
Christopher Jones
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
Chuck Burgess
98bcc0bd43 add test for bug #70700 2017-06-20 14:43:20 +10:00
Christopher Jones
f7ef5d2219 Merge branch 'PHP-7.1'
* PHP-7.1:
  oci8 - Implementation of Oracle TAF Callback
2017-06-20 14:34:05 +10:00
Christopher Jones
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
KoenigsKind
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
Christopher Jones
2f4db57bea Merge branch 'PHP-7.1'
* PHP-7.1:
  add test for bug #60994
2017-06-20 14:24:56 +10:00
Christopher Jones
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
Chuck Burgess
51a7e35c24 add test for bug #60994 2017-06-20 14:22:28 +10:00
Mitch Hagstrand
7cb18b2a46 BUG #74737: Incorrect ReflectionFunction information for mysqli_get_client_info 2017-06-19 22:14:26 -04:00
chance garcia
510230d3dc Test ftp_ssl_connect() function : error conditions
test timeout warning
ensure connection fails with invalid hostname
test invalid parameter types
test exceeds expected number of parameters
2017-06-19 19:48:52 -04:00
Dmitry Stogov
40ecad3402 Fixed wrong usage of old ZPP API. 2017-06-19 18:08:50 +03:00
Christoph M. Becker
e511f152f4 Merge branch 'pull-request/2528'
* pull-request/2528:
  Change flags to use SQLITE3_OPEN_READ* constants instead of a fake-boolean, add tests on errors
  Implement writing to BLOBs in SQLite3
2017-06-19 14:47:42 +02:00
Dmitry Stogov
9c2a1f52a5 Avoid useless dereferences and separations during paramter passing. 2017-06-19 12:55:59 +03:00
Dmitry Stogov
6fe75aad6d Optimization for fast path. 2017-06-19 10:07:11 +03:00
Niklas Keller
9badf35386 Default single_dh_use and honor_cipher_order to true 2017-06-18 19:54:45 -04:00
Charles R. Portwood II
498716c2f7 Compatibility with libargon2 versions 20161029 and 20160821
libargon2 20161029 introduces the `type` parameter to the argon2_encodedlen
function that is not present in 20160821. This change ensures the Argon2
functionality introduced in RFC `argon2_password_hash` is compatible with
both versions, as the library version that package maintainers package may
differ.
2017-06-18 19:19:20 -04:00
Jakub Zelenka
fbb884e532 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-18 19:08:51 +01:00
Jelle van der Waa
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
Jakub Zelenka
bfa9362d43 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-18 18:28:54 +01:00
Jakub Zelenka
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
chance garcia
d3c593a585 add test for strptime(): return false on failure
Closes https://github.com/php/php-src/pull/2583
2017-06-18 12:28:50 -04:00
Jakub Zelenka
192b2d8391 Merge branch 'PHP-7.1' 2017-06-18 19:09:21 +01:00
Jakub Zelenka
8ec45be8db Merge branch 'PHP-7.1' 2017-06-18 18:32:19 +01:00
Jakub Zelenka
9dada7b291 Merge branch 'PHP-7.1' 2017-06-16 17:15:11 +01:00
Jakub Zelenka
c2a348b5bc Merge branch 'PHP-7.0' into PHP-7.1 2017-06-16 17:14:23 +01:00
Jelle van der Waa
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
Remi Collet
fdfc5c1b3d code de-duplication in ReflectionType::__toString and ReflectionNamedType::getName
This code duplication introduce an inconsistency in displayed type name
- bool (reflection) vs boolean
- int (reflection) vs integer

And reflection already use zend_get_type_by_const in other methods...

Inconsistenty is kept for BC reason.
Could be fixed in 8.0
2017-06-15 15:38:03 +02:00
Xinchen Hui
3e6c0b7826 Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
  Change PHP_OS_FAMILY to "Darwin" instead of "Mac" for Darwin based systems (as suggested by Davey)
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
  Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY
  Avoid run-time checks performed at compile-time.
  Fixed performance degradaton introduced in f6ac96b
  NEWS
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
  NEWS
  NEWS
  Fixes bug #74708 reflection signatures for random_bytes+random_int
2017-06-14 10:42:37 +08:00