clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,874 Commits 491 Branches 1,363 Tags 841 MiB
05c65de082
Commit Graph

44428 Commits

Author SHA1 Message Date
Anatol Belski
a8e25fdbf8 Test to cover the change in ce1a0d97 2017-08-01 12:49:45 +02:00
Anatol Belski
eab66f9068 remove dup of the binary file, rely on a test runtime copy instead 2017-07-30 17:51:27 +02:00
Christoph M. Becker
2d6d1ec55b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Shrink another large image
 2017-07-30 16:27:38 +02:00
Christoph M. Becker
2d96fdd54f Shrink another large image 
This image is only used for testing `BITMAPV5HEADER` support in
`getimagesize()` (see bf9ad4e). Therefore it is not necessary to have
a big image; a single pixel is sufficient.
 2017-07-30 16:26:06 +02:00
Christoph M. Becker
82e4ad3983 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Shrink test image
 2017-07-30 14:44:52 +02:00
Christoph M. Becker
74a696d53b Shrink test image 
The last (`IDAT`) chunk in this file starting at `0x5e265` reports to
have a length of `0x2000` bytes, but there are only `0x1D9B` bytes
left. Simply cutting the first `IDAT` chunk which starts at `0x31` and
also reports a length of `0x2000` at the same offset should produce the
same test results (while reducing the file size to 7.628 bytes).
 2017-07-30 14:43:37 +02:00
Christoph M. Becker
f213ee5952 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip this test if ext/gd is not available
 2017-07-30 13:30:18 +02:00
Christoph M. Becker
4d6f808c16 Skip this test if ext/gd is not available 2017-07-30 13:24:10 +02:00
Nikita Popov
c48c638aeb Merge branch 'PHP-7.0' into PHP-7.1 2017-07-28 13:03:02 +02:00
Nikita Popov
e3d25e78eb Fixed bug #62934 2017-07-28 13:02:25 +02:00
Anatol Belski
55e7459cea Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  relax test on travis
 2017-07-28 00:27:52 +02:00
Anatol Belski
b01336814d relax test on travis 2017-07-28 00:27:11 +02:00
Xinchen Hui
0ddda0dcb7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed test
 2017-07-27 12:50:28 +08:00
Xinchen Hui
9fcfe52d03 Fixed test 2017-07-27 12:50:17 +08:00
Xinchen Hui
84a18c4782 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74949 (null pointer dereference in _function_string)
 2017-07-27 11:23:27 +08:00
Xinchen Hui
e36c04ef48 Fixed bug #74949 (null pointer dereference in _function_string) 2017-07-27 11:23:06 +08:00
Sara Golemon
80f4297c25 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
 2017-07-26 18:55:46 -04:00
Sara Golemon
c7aa8ba0ee
Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods 2017-07-26 18:55:23 -04:00
Anatol Belski
eaf5c7cdd4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74833, SID constant created with wrong module number
 2017-07-26 13:20:48 +02:00
Anatol Belski
bd00fe81cc Fixed bug #74833, SID constant created with wrong module number 2017-07-26 13:19:41 +02:00
Joe Watkins
bb9ea4e88b
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases
 2017-07-26 10:47:22 +01:00
Benjamin W. Broersma
6b1fbafdf0
Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases 2017-07-26 10:46:50 +01:00
Christopher Jones
46a6ae0d45 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-26 15:23:17 +10:00
Christopher Jones
de65a2243f Expose oci_unregister_taf_callback() 2017-07-26 15:22:44 +10:00
Xinchen Hui
3df47c12f7 Fixed bug #74980 (Narrowing occurred during type inference) 2017-07-26 12:06:33 +08:00
Joe Watkins
238f837cbc
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed finding CURL on systems with multiarch support
 2017-07-25 06:58:37 +01:00
Carsten Brandt
3fd7d819b8
Fixed finding CURL on systems with multiarch support 
fixes https://bugs.php.net/bug.php?id=74125

This commit makes the cURL config script aware of debian/ubuntu
[multiarch support][1] which installs architecture specific
headers in a different location.

It checks whether the `dpkg-architecture` script exists and is
executeable, if that is the case, the multiarch architecture is
detected by calling `dpkg-architecture -qDEB_HOST_MULTIARCH` as
documented in [debian multiarch implementation docs][2]:

> `/usr/include/<triplet>`: used for arch-varying headers

[1]: https://wiki.debian.org/Multiarch
[2]: https://wiki.debian.org/Multiarch/Implementation
 2017-07-25 06:58:11 +01:00
Joe Watkins
78ad5e8864
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  minor loop optimizations, closes #2633
 2017-07-25 06:51:44 +01:00
Joe Watkins
69b48f83df
minor loop optimizations, closes #2633 2017-07-25 06:47:58 +01:00
andrewnester
dbc2ffba82
Fixed #74977 - Appending AppendIterator leads to segfault 2017-07-25 06:39:50 +01:00
Joe Watkins
b44484b912
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update copyright year to 2017
 2017-07-24 17:24:10 +01:00
Peter Kokot
924ff6164e
Update copyright year to 2017 2017-07-24 17:23:57 +01:00
Anatol Belski
2dc81d4a09 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add test for bug #74903
 2017-07-24 17:02:55 +02:00
Anatol Belski
a769d873f8 Add test for bug #74903 2017-07-24 17:02:10 +02:00
Anatol Belski
e2b61eccb9 Followup on 0ec147d3 for another place 
which requires also to move the macros into the header

(cherry picked from commit b7eb2c0604)
 2017-07-24 16:33:12 +02:00
Anatol Belski
6918a68d9d Ensure binary mode for OpenSSL I/O 
Essential for OpenSSL 1.1.0 on Windows, some issues was revealed earlier
and now by openssl_pkcs12_export_to_file_basic.phpt.

(cherry picked from commit 0ec147d301)
 2017-07-24 16:31:09 +02:00
Joe Watkins
5816ce330c
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  openssl: Add openssl_pkcs12_export_to_file tests
 2017-07-24 10:46:52 +01:00
Jelle van der Waa
23c124ec75
openssl: Add openssl_pkcs12_export_to_file tests 
Add basic tests for openssl_pkcs12_export_to_file.
 2017-07-24 10:46:42 +01:00
Joe Watkins
642fb44d69
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update PHP 5 version to 7 in header comments
 2017-07-24 10:42:35 +01:00
Peter Kokot
c4e11c8ef3
Update PHP 5 version to 7 in header comments 2017-07-24 10:42:15 +01:00
Nikita Popov
f116a88592 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-23 12:21:16 +02:00
Christoph M. Becker
418da85f15 Fix #71606: Segmentation fault mb_strcut with HTML-ENTITIES 
The HTML decoding filter uses the `opaque` member of mbfl_convert_filter
as buffer, but there was no copy constructor defined, what caused double
frees when the filter is copied (what happens multiple times in mb_strcut(),
for instance).
 2017-07-23 12:19:27 +02:00
Anatol Belski
4cb1151fff Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
 2017-07-22 10:36:31 +02:00
Anatol Belski
e405ff59f9 Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class 2017-07-22 10:35:26 +02:00
Nikita Popov
69ec51eb02 Fix DFG construction for VERIFY_RETURN 
`use` only contains uses prior to definition. This was not
honoured for VERIFY_RETURN with a temporary operand.

The test case only breaks on PHP 7.2.
 2017-07-21 23:20:56 +02:00
Xinchen Hui
08177312fb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
 2017-07-21 18:16:54 +08:00
Xinchen Hui
3a7b0027f3 Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces) 2017-07-21 18:16:11 +08:00
Anatol Belski
8ef5a50e2d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix dir separator in test
 2017-07-19 22:41:32 +02:00
Anatol Belski
f67a3cc9bd fix dir separator in test 2017-07-19 22:41:09 +02:00
Sara Golemon
a9e8239f45 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Do not allow using traits/interfaces/abstract classes as stream wrappers
 2017-07-19 14:01:00 -04:00
Sara Golemon
c9fd093127
Do not allow using traits/interfaces/abstract classes as stream wrappers 
Fixes https://bugs.php.net/bug.php?id=74951
 2017-07-19 14:00:00 -04:00
Lior Kaplan
2b36f3d71f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add oci8_failover.c to config.w32, follow up for commit 1b797f7a
 2017-07-19 17:26:38 +03:00
Lior Kaplan
2cca43b3ab Add oci8_failover.c to config.w32, follow up for commit 1b797f7a 2017-07-19 17:23:22 +03:00
Nikita Popov
8e7c99acf4 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-18 22:16:11 +02:00
andrewnester
afc22828ea Fixed #74699 - Broken ArrayIterator unserializing 2017-07-18 22:14:11 +02:00
Nikita Popov
4e9158da76 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-18 21:45:35 +02:00
YaoGuai
51cdd3dc50 Fix check of mysql_commit() return value 
For mysql_commit() everything non-zero is an error.
 2017-07-18 21:45:02 +02:00
Andrew Nester
6c32d271d2 Fixed #74892 - Fixed URL rewriting for urls started with # 2017-07-18 21:20:03 +02:00
Joe Watkins
e0282c3b58
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74906 redirecting incorrect include <sys/errno.h>
 2017-07-17 06:55:02 +01:00
Peter Kokot
4d08b9dac0
Fixed bug #74906 redirecting incorrect include <sys/errno.h> 2017-07-17 06:54:27 +01:00
Anatol Belski
6cd140fdf8 Add test for bug #74923 2017-07-15 11:30:56 +02:00
Christopher Jones
3b60af90fd Merge branch 'PHP-7.0' into PHP-7.1 2017-07-14 14:13:33 +10:00
Christopher Jones
c1504b81d3 Bump OCI8 version for recent patch 2017-07-14 14:13:08 +10:00
Anatol Belski
8b04e89ef0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  increase poll timeout as false positives mitigation
 2017-07-12 14:49:58 +02:00
Anatol Belski
04cc2f6473 increase poll timeout as false positives mitigation 2017-07-12 14:38:12 +02:00
Anatol Belski
7360e6a36f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Add more constants, improve comments, and add tests"
 2017-07-10 17:01:25 +02:00
Anatol Belski
a797421e98 Revert "Add more constants, improve comments, and add tests" 
This reverts commit 0c4f11ecaa.
 2017-07-10 16:53:56 +02:00
Anatol Belski
fd08eaa8bc improve test 2017-07-10 13:49:44 +02:00
Joe Watkins
de32c9efc8
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  #73594 tests only check the extra params if dns_get_record is successful
 2017-07-10 06:55:53 +01:00
Pedro Magalhães
2689917b17
#73594 tests only check the extra params if dns_get_record is successful 2017-07-10 06:55:31 +01:00
Joe Watkins
ccd0ff3ac4
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74852 (property_exists returns true on unknown DateInterval property)
 2017-07-10 06:53:59 +01:00
jhdxr
5cf54f6073
Fixed bug #74852 (property_exists returns true on unknown DateInterval property) 2017-07-10 06:53:22 +01:00
Anatol Belski
02cc492015 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74883 SQLite3::__construct() produces "out of memory" exception with invalid flags
 2017-07-09 01:31:25 +02:00
Anatol Belski
b5338c0b7d Fixed bug #74883 SQLite3::__construct() produces "out of memory" exception with invalid flags 2017-07-08 23:52:22 +02:00
Stanislav Malyshev
0ba04f7737 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Improve fix for #74145
  Fix wddx
  Fix tests
  Fixed bug #74111
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
  Fixed bug #74111
  Fix #74435: Buffer over-read into uninitialized memory
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #73807
 2017-07-04 21:18:10 -07:00
Stanislav Malyshev
f76a6cd023 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix tests
 2017-07-04 21:05:06 -07:00
Stanislav Malyshev
6b18d956de Fix wddx 2017-07-04 20:19:34 -07:00
Stanislav Malyshev
e46d589624 Fix tests 2017-07-04 20:12:57 -07:00
Stanislav Malyshev
0496f5407f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
  Fixed bug #74111
  Fix #74435: Buffer over-read into uninitialized memory
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #73807
 2017-07-04 19:44:51 -07:00
Nikita Popov
3a25a56a92 Fixed bug #74111 2017-07-04 19:38:42 -07:00
Stanislav Malyshev
73cabfedf5 Fix bug #74651 - check EVP_SealInit as it can return -1 2017-07-04 19:30:56 -07:00
Stanislav Malyshev
f7f4fd4706 Fix bug #74087 
Ported from https://vcs.pcre.org/pcre/code/trunk/pcre_jit_compile.c?r1=1676&r2=1680&view=patch
 2017-07-04 19:21:28 -07:00
Derick Rethans
e8b7698f5e Fixed parsing of strange formats with mixed month/day and time strings 2017-07-04 19:19:30 -07:00
Stanislav Malyshev
2aae60461c Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV 2017-07-04 19:06:42 -07:00
Nikita Popov
f8c514ba6b Fixed bug #74111 2017-07-04 19:06:16 -07:00
Christoph M. Becker
8dc4f4dc9e Fix #74435: Buffer over-read into uninitialized memory 
The stack allocated color map buffers were not zeroed before usage, and
so undefined palette indexes could cause information leakage.
 2017-07-04 19:00:57 -07:00
Stanislav Malyshev
89637c6b41 Fix bug #74651 - check EVP_SealInit as it can return -1 2017-07-04 12:32:06 -07:00
Remi Collet
1fa8e74d6e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Adapt for 32-bits which fails at different offset (49 vs 38)
 2017-07-04 20:26:53 +02:00
Remi Collet
4b38feabe7 Adapt for 32-bits which fails at different offset (49 vs 38) 2017-07-04 20:25:59 +02:00
Anatol Belski
41ba98f02d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix datatype
 2017-07-04 16:38:12 +02:00
Anatol Belski
a29264eb8c fix datatype 2017-07-04 16:37:17 +02:00
Anatol Belski
2dc24005d9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74101 and bug #74614
 2017-07-04 10:42:48 +02:00
Nikita Popov
d02f953faf Fixed bug #74101 and bug #74614 2017-07-04 10:39:41 +02:00
Bob Weinand
af7bfc71fd Merge branch 'PHP-7.0' into PHP-7.1 2017-07-01 11:52:41 +02:00
Bob Weinand
e3cc15daf2 Fixed bug #74840 (Opcache overwrites argument of GENERATOR_RETURN within finally) 2017-07-01 11:52:03 +02:00
Adam Baratz
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
Adam Baratz
08089f014c Fixed #69356: PDOStatement::debugDumpParams() truncates query 2017-06-29 11:39:50 +02:00
Nikita Popov
e938cfc921 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-25 20:17:26 +02:00
Nikita Popov
604827b694 Fixed bug #73173 
Patch by tloi at fortinet dot com.
 2017-06-25 20:17:06 +02:00
Bob Weinand
44d734254a Merge branch 'PHP-7.0' into PHP-7.1 2017-06-25 20:13:48 +02:00
Matthew Trescott
0c4f11ecaa Add more constants, improve comments, and add tests 2017-06-25 20:12:45 +02:00
Jakub Zelenka
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
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