clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,685 Commits 494 Branches 1,367 Tags 786 MiB
efb1be547c
Commit Graph

44314 Commits

Author SHA1 Message Date
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