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

109773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
bcf20963c1 Next is 7.3.8 2019-06-11 13:31:30 +02:00
Remi Collet
3080fc3971 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  next is 7.2.21
 2019-06-11 12:19:17 +02:00
Remi Collet
05c60abfdb next is 7.2.21 2019-06-11 12:18:43 +02:00
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
Peter Kokot
53b0f4ba4e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Extend wildcard files section in EditorConfig [ci skip]
 2019-06-09 22:54:59 +02:00
Peter Kokot
65ada39360 Extend wildcard files section in EditorConfig [ci skip] 
Changes:
- Trim trailing whitespace for all files except patches. There isn't
  really any practical reason to not trim the trailing whitespace in all
  other files. Binary files or phpt files that include trailing
  whitespace as part of the test should be manually set in editors/IDEs
  or by disabling the editorconfig for particular editing.
- Add *.ac, *.d, *.l, *.skl, *.re, *.wsdl, *.dtd, *.html, *.rng, *.xml,
  *.xsd, *.xsl, buildconf, and Makefile* files settings.

Closes #4156
 2019-06-09 22:53:58 +02:00
Dmitry Stogov
15e01132cf Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Restored NEWS entry
 2019-06-07 12:38:37 +03:00
Dmitry Stogov
10b208f28d Restored NEWS entry 2019-06-07 12:37:49 +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
d154301866 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-04 16:27:57 +02:00
Nikita Popov
a3e6b50442 Fixed bug #78050 
This is a backport of a982125561.
 2019-06-04 16:26:34 +02:00
Nikita Popov
a4633b13d4 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-04 16:14:14 +02:00
Nikita Popov
2d3bc71e89 Reload tsrmls_id in release builds as well 
If TSRM is shut down and started again (something that phpdbg does),
then tsrmls_id needs to be reloaded everywhere. As tsrmls_id
update is a rare operation, doing that shouldn't be a problem.
 2019-06-04 16:12:59 +02:00
Remi Collet
9a495911c8 this was in 7.3.5, not 7.3.6 2019-06-04 07:19:29 +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
547665c720 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update SDK version for AppVeyor
 2019-06-01 13:44:10 +02:00
Anatol Belski
59b0b38d3c Update SDK version for AppVeyor 2019-06-01 13:43:31 +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
Anatol Belski
06eef1f70f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix var name
 2019-05-31 20:50:17 +02:00
Anatol Belski
d293f6dcff Fix var name 2019-05-31 20:49:42 +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
Christoph M. Becker
f3cd6931ca Update NEWS for 7.3.6 2019-05-29 09:27:23 +02:00
Remi Collet
582469eef2 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  add NEWS entries for sec fix
 2019-05-29 08:53:42 +02:00
Remi Collet
3051147019 add NEWS entries for sec fix 2019-05-29 08:53:23 +02:00
Joe Watkins
6c73b2088a Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  disabled functions must not have return type
 2019-05-29 08:30:41 +02:00
Joe Watkins
7821cc3b9f disabled functions must not have return type 2019-05-29 08:30:08 +02:00