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
105,381 Commits 491 Branches 1,363 Tags 841 MiB
f5664a1492
Commit Graph

47135 Commits

Author SHA1 Message Date
Joe Watkins
5262bd9ea3
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
 2017-10-30 14:13:31 +00:00
Fabien Villepinte
a308000ff2
Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders 2017-10-30 14:13:05 +00:00
Fabien Villepinte
97ff1c9243
Fix bug #75461 Wrong reflection on SoapServer:setClass 2017-10-30 14:11:15 +00:00
Xinchen Hui
60e8e4700c Merge branch 'PHP-7.2' 
* PHP-7.2:
  Use abbrev
 2017-10-30 18:17:50 +08:00
Xinchen Hui
db4eb54149 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Use abbrev
 2017-10-30 18:17:41 +08:00
Dmitry Stogov
fad75a54d4 Merge branch 'master' into rc_debug 
* master: (26 commits)
  Better fix for bug #75451 (Assertion fails while foreach on empty xpath query)
  Catch with the latest AppVeyor unzip errors
  Fixed type inference
  Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
  Fix compiler warnings
  We don't use a specific model for a MAKERNOTE so remove these checks that doesn't do anything anyway
  Remove these old comments, as for the TODO, there is already a FR for this
  Re-enable AppVeyor cache
  make sure run-tests reports exit status upon prerequisite error
  Remove implicit constants from test case
  Fix invalid read in zend_use_undefined_constant()
  Fix invalid read in mb_ord()
  Remove --with-libmbfl configure option
  Fixed bug #75451 (Assertion fails while foreach on empty xpath query)
  Add tests for UConverter::getStandards()
  convert spaces to tabs in ext/ftp/tests/server.inc
  Add tests for ftp_rename
  Fix bug #75434 Wrong reflection for mysqli_fetch_all function
  Don't optimize input arrays with suffix holes
  Fix bug #75307 Wrong reflection for openssl_open function
  ...
 2017-10-30 12:11:35 +03:00
Dmitry Stogov
2065d51a18 Better fix for bug #75451 (Assertion fails while foreach on empty xpath query) 2017-10-30 12:04:15 +03:00
Xinchen Hui
d9de0f8683 Use abbrev 2017-10-30 16:26:59 +08:00
Dmitry Stogov
1f5c0fad21 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed type inference
 2017-10-30 10:44:25 +03:00
Dmitry Stogov
49256dcf6f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed type inference
 2017-10-30 10:44:12 +03:00
Dmitry Stogov
230e505fd8 Fixed type inference 2017-10-30 10:41:27 +03:00
Joe Watkins
f844813c60
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
 2017-10-30 06:56:20 +00:00
Joe Watkins
1a72d3225c
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
 2017-10-30 06:55:58 +00:00
Joe Watkins
63c0ecc445
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
 2017-10-30 06:55:28 +00:00
Fabien Villepinte
e6aea3dc78
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect 2017-10-30 06:55:00 +00:00
Kalle Sommer Nielsen
6b88b3bc25 Fix compiler warnings 2017-10-29 16:43:21 +01:00
Kalle Sommer Nielsen
85fa3aa4c0 We don't use a specific model for a MAKERNOTE so remove these checks that doesn't do anything anyway 2017-10-29 16:42:13 +01:00
Kalle Sommer Nielsen
09f829d996 Remove these old comments, as for the TODO, there is already a FR for this 2017-10-29 16:36:34 +01:00
Christoph M. Becker
c4c4056041 Remove implicit constants from test case 
`FILTER_FLAG_SCHEME_REQUIRED` and `FILTER_FLAG_HOST_REQUIRED` are
implicitly used for `FILTER_VALIDATE_URL` so there is no need to
specify them explicitly.

Cf. https://bugs.php.net/75442.
 2017-10-28 18:00:10 +02:00
Nikita Popov
251c1b1a44 Fix invalid read in mb_ord() 2017-10-28 16:44:32 +02:00
Peter Kokot
5c5bd30339 Remove --with-libmbfl configure option 
The bundled libmbfl library is no longer API or ABI compatible with
the (currently unmaintained) upstream library. As such, building
against an external libmbfl is no longer possible.
 2017-10-28 16:11:30 +02:00
Xinchen Hui
1a9e64362c Fixed bug #75451 (Assertion fails while foreach on empty xpath query) 2017-10-28 21:38:26 +08:00
Fabien Villepinte
557edb75c0 Add tests for UConverter::getStandards() 2017-10-28 14:03:05 +02:00
Michael Kliewe
ba0ef9139c convert spaces to tabs in ext/ftp/tests/server.inc 2017-10-28 13:02:23 +02:00
Michael Kliewe
7d5bf6e269 Add tests for ftp_rename 2017-10-28 13:02:23 +02:00
Nikita Popov
8d54f98e33 Merge branch 'PHP-7.2' 2017-10-28 12:58:43 +02:00
Nikita Popov
58f90ab569 Merge branch 'PHP-7.1' into PHP-7.2 2017-10-28 12:58:23 +02:00
Nikita Popov
27856f64c3 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-28 12:57:46 +02:00
Fabien Villepinte
938f256ed9 Fix bug #75434 Wrong reflection for mysqli_fetch_all function 2017-10-28 12:57:25 +02:00
Sara Golemon
352b406650 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Don't optimize input arrays with suffix holes
 2017-10-27 13:07:50 -04:00
Sara Golemon
cc96166f74
Don't optimize input arrays with suffix holes 2017-10-27 13:07:33 -04:00
Joe Watkins
5ce7113467
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75307 Wrong reflection for openssl_open function
 2017-10-27 16:07:30 +01:00
Joe Watkins
f2367d4626
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75307 Wrong reflection for openssl_open function
 2017-10-27 16:06:57 +01:00
Joe Watkins
14be7dcf8e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75307 Wrong reflection for openssl_open function
 2017-10-27 16:06:29 +01:00
Fabien Villepinte
51ea2cfbe1
Fix bug #75307 Wrong reflection for openssl_open function 2017-10-27 16:06:01 +01:00
Anatol Belski
0ab89a5d37 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Skip test on PostgreSQL 10
 2017-10-27 16:24:22 +02:00
Anatol Belski
cbf385e68c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Skip test on PostgreSQL 10
 2017-10-27 16:23:50 +02:00
Anatol Belski
005205714b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip test on PostgreSQL 10
 2017-10-27 16:23:19 +02:00
Anatol Belski
15a71fe045 Skip test on PostgreSQL 10 
The 42P18 error is not produced by the server anymore.
 2017-10-27 16:19:42 +02:00
Sara Golemon
fabb5b7a74
array_slice() passthrough for preserve_keys=true as well 2017-10-27 10:14:03 -04:00
Sara Golemon
e751e6ceba
Do not create a new array when slicing all of input array. 2017-10-27 10:09:05 -04:00
Anatol Belski
25da0bd658 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:05:15 +02:00
Anatol Belski
f936a17c12 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:04:54 +02:00
Anatol Belski
36b27f2ba5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:04:29 +02:00
Anatol Belski
24b1bb0abd Fix test compat for PostgreSQL 10 2017-10-27 14:58:43 +02:00
Anatol Belski
bf43ab53ae Merge branch 'PHP-7.2' 
* PHP-7.2:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:18:55 +02:00
Anatol Belski
40f76c9f0c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:18:27 +02:00
Anatol Belski
211dacd7b5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:17:57 +02:00
Dmitry Stogov
8203a0668d Merge branch 'master' into rc_debug 
* master:
  Use per-request heap instead of system one
  Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases
  Makrk persistent resources and references with GC_PERSISTENT flag
 2017-10-27 14:59:09 +03:00
Dmitry Stogov
cf67a421e9 Use per-request heap instead of system one 2017-10-27 14:45:54 +03:00
Anatol Belski
10dc1950f7 Apply upstream patch for CVE-2017-14107 2017-10-27 13:20:15 +02:00
Dmitry Stogov
49ea143bbd Encapsulate reference-counting primitives. 
Prohibit direct update of GC_REFCOUNT(), GC_SET_REFCOUNT(), GC_ADDREF() and GC_DELREF() shoukf be instead.
Added mactros to validate reference-counting (disabled for now).
These macros are going to be used to eliminate race-condintions during reference-counting on data shared between threads.
 2017-10-27 01:28:58 +03:00
Joe Watkins
25a3ebdc73
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix typo in comments
 2017-10-25 21:00:03 +01:00
Joe Watkins
5e9f7f619e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix typo in comments
 2017-10-25 20:59:51 +01:00
Fabien Villepinte
578ba71b3b
Fix typo in comments 2017-10-25 20:59:40 +01:00
Fabien Villepinte
c0f3c3d222
Fix typo in comments 2017-10-25 20:59:13 +01:00
Christoph M. Becker
14469dedde Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt
 2017-10-25 14:58:49 +02:00
Christoph M. Becker
a059244b3c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt
 2017-10-25 14:53:01 +02:00
Christoph M. Becker
b6b0289f5e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt
 2017-10-25 14:47:11 +02:00
Fabien Villepinte
e763a1cdc7 Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt 2017-10-25 14:39:38 +02:00
Christoph M. Becker
1530d01b7a Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75437 Wrong reflection on imagewebp
 2017-10-25 13:10:33 +02:00
Christoph M. Becker
c78813a6b8 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75437 Wrong reflection on imagewebp
 2017-10-25 13:03:42 +02:00
Christoph M. Becker
9d59beb8ba Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75437 Wrong reflection on imagewebp
 2017-10-25 12:56:25 +02:00
Fabien Villepinte
0fbb9f343f Fix bug #75437 Wrong reflection on imagewebp 2017-10-25 12:54:05 +02:00
Anatol Belski
4d108dc3fe Merge branch 'PHP-7.2' 
* PHP-7.2:
  Parametrize the expected value to avoid platform false positives
 2017-10-24 18:39:05 +02:00
Anatol Belski
ffeb8d1b03 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Parametrize the expected value to avoid platform false positives
 2017-10-24 18:38:44 +02:00
Anatol Belski
67b99b698f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Parametrize the expected value to avoid platform false positives
 2017-10-24 18:38:23 +02:00
Anatol Belski
e19bf29b53 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Parametrize the expected value to avoid platform false positives
 2017-10-24 18:36:56 +02:00
Anatol Belski
45ac5edbd9 Parametrize the expected value to avoid platform false positives 2017-10-24 18:33:21 +02:00
Sara Golemon
54ba77c30e Merge branch 'PHP-7.2' 
* PHP-7.2:
  Decref default_link when clearing
 2017-10-24 11:38:32 -04:00
Sara Golemon
d0d7db8b3f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Decref default_link when clearing
 2017-10-24 11:38:24 -04:00
Sara Golemon
53fe84bfcc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Decref default_link when clearing
 2017-10-24 11:38:17 -04:00
Sara Golemon
68e27b0763
Decref default_link when clearing 2017-10-24 11:37:59 -04:00
Christoph M. Becker
4d950fa792 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #65148 (imagerotate may alter image dimensions)
 2017-10-24 17:23:24 +02:00
Christoph M. Becker
c04617aa61 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #65148 (imagerotate may alter image dimensions)
 2017-10-24 17:17:18 +02:00
Christoph M. Becker
9c79de4d62 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #65148 (imagerotate may alter image dimensions)
 2017-10-24 17:09:59 +02:00
Christoph M. Becker
22c487616f Fixed bug #65148 (imagerotate may alter image dimensions) 
We apply the respective patches from external libgd, work around the
still missing `gdImageClone()`, and fix the special cased rotation
routines according to Pierre's patch
(https://gist.github.com/pierrejoye/59d72385ed1888cf8894a7ed437235ae).

We also cater to bug73272.phpt whose result obviously changes a bit.
 2017-10-24 17:02:56 +02:00
Dmitry Stogov
9cf87aa196 Avoid HashTable allocations for empty arrays (using zend_empty_array). 2017-10-24 17:27:31 +03:00
Derick Rethans
2ca08a3d66 Merge branch 'PHP-7.2' 2017-10-24 14:56:39 +01:00
Derick Rethans
ca23b0484c Merge branch 'PHP-7.1' into PHP-7.2 2017-10-24 14:56:24 +01:00
Derick Rethans
7bc31238b4 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-24 14:55:48 +01:00
Derick Rethans
8e3260376c Update timezonemap.h, which needs to match the bundled TZ db 2017-10-24 14:55:13 +01:00
Anatol Belski
8ad71bc1d2 Fix test 2017-10-24 14:58:01 +02:00
Anatol Belski
9138966c67 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #72535 arcfour encryption stream filter crashes php
 2017-10-24 14:05:18 +02:00
Anatol Belski
968c8fc0d5 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #72535 arcfour encryption stream filter crashes php
 2017-10-24 14:04:08 +02:00
Anatol Belski
37acebcc8c Fixed bug #72535 arcfour encryption stream filter crashes php 2017-10-24 13:59:18 +02:00
Anatol Belski
69ecd5edb2 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
 2017-10-24 13:45:59 +02:00
Anatol Belski
e97b10f1a0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
 2017-10-24 13:45:16 +02:00
Anatol Belski
4d31ee9043 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
 2017-10-24 13:44:03 +02:00
Anatol Belski
5efbcd1882 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
 2017-10-24 13:38:48 +02:00
Anatol Belski
a7815e63bd Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian() 2017-10-24 11:28:17 +02:00
Anatol Belski
d37658be6c Apply upstream patch for CVE-2016-1283 
Fix bug #75207, see also
https://bugzilla.redhat.com/show_bug.cgi?id=1295385
https://vcs.pcre.org/pcre?view=revision&revision=1636

(cherry picked from commit d11fceab15)
 2017-10-24 11:10:11 +02:00
Sara Golemon
8f804a2128
Add support for zlib/level context option 2017-10-23 22:14:52 -04:00
Sara Golemon
55ac4f0929 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Bugfix#75419 Fix clearing of default link during pg_close()
 2017-10-23 14:44:51 -04:00
Sara Golemon
ece23ea20f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Bugfix#75419 Fix clearing of default link during pg_close()
 2017-10-23 14:44:40 -04:00
Sara Golemon
781521e112 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bugfix#75419 Fix clearing of default link during pg_close()
 2017-10-23 14:44:28 -04:00
Sara Golemon
a645af4456
Bugfix#75419 Fix clearing of default link during pg_close() 2017-10-23 14:44:00 -04:00
Anatol Belski
c51bc3814a Merge branch 'PHP-7.2' 
* PHP-7.2:
  Update libmagic.patch
 2017-10-23 19:18:57 +02:00
Anatol Belski
b4db9e9acc Update libmagic.patch 2017-10-23 19:18:25 +02:00
Anatol Belski
bcad693468 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fail hard when re2c is not found or the version requirement not met
  Fix mismatching alloc
 2017-10-23 19:15:43 +02:00