clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,496 Commits 491 Branches 1,363 Tags 844 MiB
bda0f4e8dc
Commit Graph

44225 Commits

Author SHA1 Message Date
Nikita Popov
bda0f4e8dc Merge branch 'PHP-7.0' into PHP-7.1 2017-06-25 15:30:29 +02:00
wapmorgan
cd1869bcf2 Remove invalid check of dictionary content and add initialization of dictionary if raw compression used 2017-06-25 10:53:28 +02:00
Anatol Belski
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
Nikita Popov
5b5a92b8b6 Fixed bug #74623 2017-06-23 17:32:45 +02:00
Nikita Popov
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
Nikita Popov
721de5b542 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-23 13:31:39 +02:00
ideal
4d6100569b Fix error if compiled without -fpermissive flag. 2017-06-23 13:31:23 +02:00
Joe Watkins
bd8940a1fe
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix method "eof"
 2017-06-23 07:53:12 +01:00
danchukas
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
Joe Watkins
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
jhdxr
81c2a4b9ba
fix bug #73471 PHP freezes with AppendIterator 2017-06-22 11:56:49 +01:00
Joe Watkins
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
jhdxr
db287b2303
fix bug #74780 parse_url() borken when query string contains colon 2017-06-22 11:52:06 +01:00
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
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
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
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
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
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
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
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
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
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
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
Dmitry Stogov
84b9b164a8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
 2017-06-13 17:16:13 +03:00
Dmitry Stogov
648be8600f Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY) 2017-06-13 17:15:47 +03:00
Remi Collet
90f33b1ac7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
 2017-06-13 08:50:10 +02:00
Remi Collet
78970d5338 Fix bug #74705 for collator_get_sort_key 2017-06-13 08:48:17 +02:00
Tyson Andre
5f07a895cc Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey() 
https://secure.php.net/manual/en/collator.getsortkey.php
 2017-06-13 08:46:47 +02:00
Remi Collet
3aa80c482c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  NEWS
  Fixes bug #74708 reflection signatures for random_bytes+random_int
 2017-06-13 08:14:57 +02:00
Tyson Andre
81b2533a68 Fixes bug #74708 reflection signatures for random_bytes+random_int 
They have 1 and 2 required parameters, respectively
See https://secure.php.net/manual/en/function.random-int.php
 2017-06-13 08:11:25 +02:00
Anatol Belski
0fa40b0546 group the change for bug #74720 2017-06-09 23:47:15 +02:00
Anatol Belski
cbe73b3cfe Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in 
content
 2017-06-09 17:35:37 +02:00