php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 22:41:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
101,132 Commits 547 Branches 1,483 Tags
dfadda3d090eb3bea5df62a17e8fdd5f998d7ab3
Commit Graph

44557 Commits

Author SHA1 Message Date
Xinchen Hui
d9de0f8683 Use abbrev 2017-10-30 16:26:59 +08:00
Dmitry Stogov
230e505fd8 Fixed type inference 2017-10-30 10:41:27 +03: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
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
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
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
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
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
Anatol Belski
10dc1950f7 Apply upstream patch for CVE-2017-14107 2017-10-27 13:20:15 +02: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
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
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
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
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
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
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
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
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
Derick Rethans
b07b526b95 Updated to version 2017.3 (2017c) 2017-10-23 17:31:21 +01:00
Derick Rethans
b2dfcb30eb Updated to version 2017.3 (2017c) 2017-10-23 17:31:20 +01:00
Anatol Belski
5b497797f2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix memory leak
 2017-10-23 15:40:05 +02:00
Anatol Belski
1cb2079d6c Fix memory leak 2017-10-23 15:26:08 +02:00
Jakub Zelenka
f10fd89f99 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-22 18:57:14 +01:00
Jakub Zelenka
34ed75fab7 Fix clean up for openssl_pkcs12_export_to_file_basic 2017-10-22 18:54:15 +01:00
Jelle van der Waa
314bef5d03 openssl: Fix openssl_pkcs12_export extracerts test 
Fix the openssl_pkcs12_export testcase for extracerts, the 'extracerts'
option needs to be the key of the certificate value otherwise
openssl_pkcs12_export will ignore it.
 2017-10-22 18:53:30 +01:00
Anatol Belski
e986f71527 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  With ICU 58+, set the default restriction level to high
 2017-10-21 17:24:15 +02:00
Anatol Belski
1d781fbdb1 With ICU 58+, set the default restriction level to high 
Further experiments show, that CJK scripts should be ok. If there are
any issues, the moderate level can still be set later.
 2017-10-21 17:21:41 +02:00
Anatol Belski
88ec44dfe3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Rework these new tests to match with diffs in ICU 58, 59 and upcoming 60
 2017-10-21 10:30:14 +02:00
Anatol Belski
5d85d967bd Rework these new tests to match with diffs in ICU 58, 59 and upcoming 60 2017-10-21 10:29:04 +02:00