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,641 Commits 491 Branches 1,363 Tags 844 MiB
4cb1151fff
Commit Graph

44286 Commits

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