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,248 Commits 491 Branches 1,363 Tags 841 MiB
557edb75c0
Commit Graph

47061 Commits

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