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

47061 Commits

Author SHA1 Message Date
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
Anatol Belski
fb0be397d0 Fix mismatching alloc 2017-10-23 18:49:17 +02:00
Derick Rethans
973c1e3c93 Updated to version 2017.3 (2017c) 2017-10-23 17:31:24 +01:00
Derick Rethans
12e2fc4ab6 Updated to version 2017.3 (2017c) 2017-10-23 17:31:23 +01: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
0eeaff09cb Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix memory leak
 2017-10-23 15:41:06 +02:00
Anatol Belski
9beb743b07 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix memory leak
 2017-10-23 15:40:37 +02: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
Anatol Belski
60d45e6a5b Fix visibility 2017-10-23 13:27:34 +02:00
Anatol Belski
979bad4ae2 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix uninitialized vars
 2017-10-23 12:03:16 +02:00
Anatol Belski
0e44c980f9 Fix uninitialized vars 2017-10-23 12:02:41 +02:00
Joe Watkins
9883fe24c0
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75264
 2017-10-23 09:08:12 +01:00
Joe Watkins
3a7e3ef334
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75264
 2017-10-23 09:07:45 +01:00
Joe Watkins
9bb82c0400
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75264
 2017-10-23 09:07:20 +01:00
Peter Kokot
a59e233aa1
Fix bug #75264 2017-10-23 09:06:58 +01:00
Anatol Belski
793ca716fb Fix datatypes and compiler warnings 
Switch to size_t

Not critical as an unsigned is already used, but fixes a couple of
warnings in other areas.

Normalize signature

It's a function with the usual compare semantics, returning a platform
specific at least produces unnecessary warnings elsewhere and is otherwise
inappropriate.

Fix return value

Drop unused var

Fix compiler warnings

Fix compiler warning

Fix var name in arginfo

Fix cast
 2017-10-23 08:56:57 +02:00
Kalle Sommer Nielsen
a7c23e27be Remove these ancient ldap parts for Windows thats no longer relevant 2017-10-23 03:13:53 +02:00
Andrea Faulds
e823770515 Merge JSON_THROW_ON_ERROR 2017-10-22 19:41:23 +01:00
Jakub Zelenka
d5127cec6a Merge branch 'PHP-7.2' 2017-10-22 18:59:32 +01:00
Jakub Zelenka
e33721978e Merge branch 'PHP-7.1' into PHP-7.2 2017-10-22 18:58:15 +01: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
cbc8f8327f Simplify tsrm cache update 2017-10-22 11:57:35 +02:00
Anatol Belski
202e7ce65c Missed skip 2017-10-21 17:40:38 +02:00
Anatol Belski
e952cc24db Fix build on ICU < 53 2017-10-21 17:37:51 +02:00
Anatol Belski
050d42d5d2 Merge branch 'PHP-7.2' 
* PHP-7.2:
  With ICU 58+, set the default restriction level to high
 2017-10-21 17:25:03 +02:00
Anatol Belski
bb0a15f499 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  With ICU 58+, set the default restriction level to high
 2017-10-21 17:24:42 +02: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
f56ceb7f5b Add Spoofchecker::setRestrictionLevel() and corresponding constans 2017-10-21 17:12:21 +02:00
Anatol Belski
679b1b8b32 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Add TZ and Unicode versions to intl MINFO
 2017-10-21 16:18:59 +02:00
Anatol Belski
ff1b1c2761 Add TZ and Unicode versions to intl MINFO 2017-10-21 16:17:31 +02:00
Anatol Belski
2e64f139ec Merge branch 'PHP-7.2' 
* PHP-7.2:
  Rework these new tests to match with diffs in ICU 58, 59 and upcoming 60
 2017-10-21 10:31:02 +02:00
Anatol Belski
3eb7ea55ae Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Rework these new tests to match with diffs in ICU 58, 59 and upcoming 60
 2017-10-21 10:30:43 +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
Anatol Belski
4621b042d6 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #73655 Spoofchecker::isSuspicious behavior change due to upstream changes
  Add test for newer ICU version
 2017-10-20 20:15:23 +02:00
Anatol Belski
416c993c8e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #73655 Spoofchecker::isSuspicious behavior change due to upstream changes
  Add test for newer ICU version
 2017-10-20 20:14:48 +02:00
Anatol Belski
6f395736e2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73655 Spoofchecker::isSuspicious behavior change due to upstream changes
  Add test for newer ICU version
 2017-10-20 20:14:08 +02:00
Anatol Belski
f95063647c Fixed bug #73655 Spoofchecker::isSuspicious behavior change due to upstream changes 
There are significant changes in the spoof checking reflecting
http://www.unicode.org/reports/tr39/tr39-15.html and relying on the
restriction levels. ICU 58+ removes WSC and MSC handling and otherwise
undergoes big changes in both code and data areas. Keep up with the
basic points for now, as we need to move forward and provide an
acceptable experience to PHP users linking to a newer ICU. The most
distros ATM don't provide ICU > 57.1, though. We'll need for sure to
keep up with the BC breach in ICU 58+ in possible further aspects.
 2017-10-20 19:23:32 +02:00
Anatol Belski
2198d38cbc Add test for newer ICU version 2017-10-20 19:02:42 +02:00
Anatol Belski
b996c5599e Merge branch 'PHP-7.2' 
* PHP-7.2:
  Further test fixes for ICU >= 58
  Version checks
 2017-10-20 18:41:14 +02:00
Anatol Belski
57fc9fcba4 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Further test fixes for ICU >= 58
  Version checks
 2017-10-20 18:40:55 +02:00
Anatol Belski
3d55910f35 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Further test fixes for ICU >= 58
 2017-10-20 18:40:26 +02:00
Anatol Belski
e02c41fc72 Further test fixes for ICU >= 58 2017-10-20 18:39:46 +02:00
Anatol Belski
7027a1643f Version checks 2017-10-20 18:26:14 +02:00
Anatol Belski
07036aaccb Merge branch 'PHP-7.2' 
* PHP-7.2:
  Yet two wrong version checks
 2017-10-20 16:55:53 +02:00
Anatol Belski
fb88cee0fc Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Yet two wrong version checks
 2017-10-20 16:55:32 +02:00
Anatol Belski
65d4bd0311 Yet two wrong version checks 2017-10-20 16:54:47 +02:00
Anatol Belski
80e1ca50b5 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix version checks in tests
  Fix version checks in tests
 2017-10-20 15:25:44 +02:00
Anatol Belski
0f7ddf0d47 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix version checks in tests
  Fix version checks in tests
 2017-10-20 15:25:27 +02:00
Anatol Belski
ae6d877f54 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix version checks in tests
 2017-10-20 15:25:01 +02:00
Anatol Belski
2f444640b4 Fix version checks in tests 2017-10-20 15:24:43 +02:00
Anatol Belski
7240d99838 Fix version checks in tests 2017-10-20 15:23:09 +02:00
Anatol Belski
d2c9dad3e4 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Sync some tests for compat with ICU 58.1, PHP 7.1+ part
  Sync some tests for compat with ICU 58.1+
 2017-10-20 13:59:19 +02:00
Anatol Belski
7775f9e872 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync some tests for compat with ICU 58.1, PHP 7.1+ part
  Sync some tests for compat with ICU 58.1+
 2017-10-20 13:58:53 +02:00
Anatol Belski
e2afa00b4c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Sync some tests for compat with ICU 58.1+
 2017-10-20 13:57:44 +02:00
Anatol Belski
26473523b0 Sync some tests for compat with ICU 58.1, PHP 7.1+ part 2017-10-20 13:56:58 +02:00
Anatol Belski
877e0b04bc Sync some tests for compat with ICU 58.1+ 2017-10-20 13:55:32 +02:00
Anatol Belski
a5293c1c39 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Add skip for incompatible ICU version
 2017-10-20 11:30:41 +02:00
Anatol Belski
2a361b14ea Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add skip for incompatible ICU version
 2017-10-20 11:30:09 +02:00
Anatol Belski
7751ae59ae Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add skip for incompatible ICU version
 2017-10-20 11:28:51 +02:00
Anatol Belski
9071ff5c87 Add skip for incompatible ICU version 2017-10-20 11:27:54 +02:00
Sol Richardson
e161905919
Add test for strnatcmp() align left cases 2017-10-19 12:11:03 +01:00
Peter Kokot
2bc23f8028
Update filter docs and tests 
Filter extension is better presented in the PHP manual. Some ext/filter/tests
included outdated functions or were duplicated.
 2017-10-19 12:09:06 +01:00
Peter Kokot
d2754810cd
Remove tidy examples 
PHP documentation already includes explanations and examples for most of
tidy extension. Tidy PHP functions and methods used in the examples are
also already used in the tests.
 2017-10-19 12:07:02 +01:00
Peter Kokot
7f4722a42f
Remove tokenizer PHP example script 
The tokenizer extension is best presented in the PHP manual with some
code snippets. Also the script includes old PHP dl() function.
 2017-10-19 12:06:10 +01:00
Peter Kokot
842ba86c34
Remove PHP code examples from xmlreader 
The PHP documentation can present the xmlreader extension better with
code snippets.
 2017-10-19 12:05:19 +01:00
Joe Watkins
55625dd9c9
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
 2017-10-19 12:03:54 +01:00
Joe Watkins
4b67943501
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
 2017-10-19 12:03:19 +01:00
Joe Watkins
8eee20d876
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
 2017-10-19 12:02:52 +01:00
Nester
80c3b078b8
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination 2017-10-19 12:02:22 +01:00