php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 22:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
109,773 Commits 547 Branches 1,483 Tags
bcf20963c10ffdb8d0cf3adafcf440a3e6d6484c
Commit Graph

49556 Commits

Author SHA1 Message Date
Christoph M. Becker
b215d1339f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77937: preg_match failed
 2019-06-11 08:44:07 +02:00
Christoph M. Becker
f3ff72e54b Fix #77937: preg_match failed 
On some recent Windows systems, ext\pcre\tests\locales.phpt fails,
because 'pt_PT' is accepted by `setlocale()`, but not properly
supported by the ctype functions, which are used internally by PCRE2 to
build the localized character tables.

Since there appears to be no way to properly check whether a given
locale is fully supported, but we want to minimize BC impact, we filter
out typical Unix locale names, except for a few cases which have
already been properly supported on Windows.  This way code like

  setlocale(LC_ALL, 'de_DE.UTF-8', 'de_DE', 'German_Germany.1252');

should work like on older Windows systems.

It should be noted that the locale names causing trouble are not (yet)
documented as valid names anyway, see
<https://docs.microsoft.com/en-us/cpp/c-runtime-library/locale-names-languages-and-country-region-strings?view=vs-2019>.
 2019-06-11 08:42:32 +02:00
Dmitry Stogov
a0749fe483 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed possible misalignment in 32-bit build.
 2019-06-10 12:52:50 +03:00
Dmitry Stogov
199eb2b110 Fixed possible misalignment in 32-bit build. 2019-06-10 12:51:59 +03:00
Nikita Popov
9569a0b8ca Merge branch 'PHP-7.2' into PHP-7.3 2019-06-07 10:57:43 +02:00
Nikita Popov
d7c7522be9 Enable STRICT_TRANS_TABLES in new test 
The part testing error cases relies on this.
 2019-06-07 10:57:09 +02:00
Dmitry Stogov
972223c342 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
 2019-06-07 11:48:57 +03:00
Dmitry Stogov
83cdb89f8a Fixed bug #77135 (Extract with EXTR_SKIP should skip $this) 2019-06-07 11:36:39 +03:00
Nikita Popov
a5f98139c9 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-07 09:49:01 +02:00
Cameron Porter
7d1aa7534d Fixed bug #38546 
Properly support binding boolean parameters with emulated prepared
statements disabled. Also add the necessary mysqlnd support for
MYSQL_TYPE_TINY.
 2019-06-07 09:48:43 +02:00
Christoph M. Becker
5f2f6180b9 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix test regarding Unix Domain Sockets on Windows
 2019-06-06 15:00:35 +02:00
Christoph M. Becker
2df32942d3 Fix test regarding Unix Domain Sockets on Windows 
Recent Windows versions actually support Unix Domain Sockets.  Cf.
<https://github.com/curl/curl/pull/3939>.
 2019-06-06 14:59:58 +02:00
Christoph M. Becker
22a3fa0b2e Fix #78114: segfault when calling sodium_* functions from eval 
We must not follow the NULL pointer.
 2019-06-06 10:00:15 +02:00
Joe Watkins
249c20023d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix flaky posix test
 2019-06-05 16:35:43 +02:00
Joe Watkins
f4474e5724 fix flaky posix test 2019-06-05 16:34:50 +02:00
Nikita Popov
37bba7a678 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-03 15:15:07 +02:00
Nikita Popov
ac60007bec Clear errors after SSL_CTX_load_verify_locations() 
We report our own errors here. Make sure these don't clog up the
error queue.
 2019-06-03 15:14:01 +02:00
Jakub Zelenka
8f69ca8dcd Merge branch 'PHP-7.2' into PHP-7.3 2019-06-02 19:13:18 +01:00
Jakub Zelenka
2e02579474 Fix bug #78079 (openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c) 
It also fixes invalid setting of tag length
 2019-06-02 19:10:56 +01:00
Anatol Belski
793fd6bce9 Fix expect section 2019-06-01 14:50:14 +02:00
Anatol Belski
2205546edf Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Change ZPP only if compiled with ICU >= 64
  Update tests for ICU 64
 2019-06-01 02:26:07 +02:00
Anatol Belski
ee153deb1f Change ZPP only if compiled with ICU >= 64 2019-06-01 02:18:56 +02:00
Nikita Popov
b01d9fdab1 Update tests for ICU 64 
(cherry picked from commit 8a8bc5c452)
 2019-06-01 02:17:16 +02:00
Craig Duncan
370997fb5d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Add a test for bug #65672
  Ensure the internal properties cannot be overwritten
 2019-05-30 18:55:55 +01:00
Craig Duncan
8b53c7232e Add a test for bug #65672 2019-05-30 18:55:42 +01:00
Craig Duncan
dc586bff36 Ensure the internal properties cannot be overwritten 2019-05-30 18:55:36 +01:00
Nikita Popov
61a38bb274 SCCP: Fix leak when determining TYPE_CHECK from type info 
As TYPE_CHECK is the only opcode where we do something like this,
I'm adding this hack.
 2019-05-29 16:47:19 +02:00
Nikita Popov
de7d0256a3 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-29 09:47:43 +02:00
Craig Duncan
5d67271db0 Add tests for DatePeriod properties 2019-05-29 09:47:10 +02:00
Nikita Popov
817b50826e Merge branch 'PHP-7.2' into PHP-7.3 2019-05-28 16:41:08 +02:00
Nikita Popov
59dfaa3f99 Fix type inference of SEND_UNPACK with empty array 
An empty array will not be turned into an array of references.
This violated the invariant than an array has values iff it has
keys.
 2019-05-28 16:40:56 +02:00
Stanislav Malyshev
9d473f1eac Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77967 - Bypassing open_basedir restrictions via file uris
 2019-05-27 21:36:05 -07:00
Stanislav Malyshev
fbb6a27212 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77967 - Bypassing open_basedir restrictions via file uris
 2019-05-27 21:36:00 -07:00
Stanislav Malyshev
c34895e837 Fix bug #77967 - Bypassing open_basedir restrictions via file uris 2019-05-27 18:48:48 -07:00
Stanislav Malyshev
13dffa9d32 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
 2019-05-27 17:28:25 -07:00
Stanislav Malyshev
dc1d99e772 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
 2019-05-27 17:28:20 -07:00
Stanislav Malyshev
73ff4193be Fix bug #77988 - heap-buffer-overflow on php_jpg_get16 2019-05-27 17:28:09 -07:00
Stanislav Malyshev
e63b2ba310 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix function name
 2019-05-27 17:21:23 -07:00
Stanislav Malyshev
9bca9ef6cf Fix function name 2019-05-27 17:20:56 -07:00
Stanislav Malyshev
c7eb0feed8 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS
  Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
  Fix #77973: Uninitialized read in gdImageCreateFromXbm
 2019-05-27 16:49:25 -07:00
Stanislav Malyshev
e77c8e45ba Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
  Fix #77973: Uninitialized read in gdImageCreateFromXbm
 2019-05-27 16:49:19 -07:00
Stanislav Malyshev
7cf7148a8f Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow 2019-05-27 16:32:42 -07:00
Christoph M. Becker
ed6dee9a19 Fix #77973: Uninitialized read in gdImageCreateFromXbm 
We have to ensure that `sscanf()` does indeed read a hex value here,
and bail out otherwise.
 2019-05-27 16:11:32 -07:00
Nikita Popov
0cb43ec51c Merge branch 'PHP-7.2' into PHP-7.3 2019-05-27 17:43:13 +02:00
Michael Maroszek
a0c9d0849a Fixed bug #76345 2019-05-27 17:42:20 +02:00
Nikita Popov
31ce1cbbb9 Func info: Fix calls to zero-arg varargs 
The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175.
 2019-05-27 16:14:51 +02:00
Jakub Zelenka
209b12e064 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-26 18:49:52 +01:00
Jakub Zelenka
8baf3ffde6 Add fpmi to the opcache supported sapis 2019-05-26 18:47:22 +01:00
Nikita Popov
6f9dfd9473 Fix bug #77955 
Free metadata before freeing the arena. I don't have a repro script,
but the added assertion fails for many existing tests prior to this
change.
 2019-05-23 13:40:52 +02:00
Nikita Popov
b394654c1e Merge branch 'PHP-7.2' into PHP-7.3 2019-05-23 11:12:59 +02:00