php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
109,863 Commits 547 Branches 1,483 Tags
cb1237a3ede42464b9e938fac9faebdb650047d8
Commit Graph

4312 Commits

Author SHA1 Message Date
Christoph M. Becker
5e5b7cb4d4 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78241: touch() does not handle dates after 2038 in PHP 64-bit
 2019-07-03 10:02:22 +02:00
Christoph M. Becker
44c8b7414c Fix #78241: touch() does not handle dates after 2038 in PHP 64-bit 
`time_t` defaults to `_time64` (which is 64bit signed) even on x86, but
`Int32x32To64()` truncates it to signed 32bit.  We replace the macro
with the "manual" calculation.
 2019-07-03 09:59:17 +02:00
Christoph M. Becker
801ab18ea7 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Remove stream_socket_sendto.phpt
 2019-06-26 17:01:29 +02:00
Nikita Popov
7d28a24c66 Remove stream_socket_sendto.phpt 
Fails for me locally due to different number of warnings with
different messages. Rather than adding more wildcards I'm dropping
this test entirely, as it doesn't seem to test anything particularly
useful.

(cherry picked from commit 84333cad67)
 2019-06-26 16:58:37 +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
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
Christoph M. Becker
11740abd6b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  use {TMP} placeholder in phpt tests
 2019-05-21 09:03:01 +02:00
Holly Li (WIPRO LIMITED)
202e6936d6 use {TMP} placeholder in phpt tests 2019-05-21 09:02:37 +02:00
Christoph M. Becker
69bab6e5a5 Fix #78003: strip_tags output change since PHP 7.3 
A refactoring of the strip tags state machine[1] missed the special
treatment of `depth > 0` when a `>` is encountered in state 2 or 3.  We
re-add it for BC reasons.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=5cf64742773ddbf9af69d962a4d12b567fcf0084>
 2019-05-13 13:10:24 +02:00
Christoph M. Becker
70239ea1d3 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77940: test using outdated mon_thousands_sep for Swedish
 2019-04-25 23:29:03 +02:00
Christoph M. Becker
7ddfe73e69 Fix #77940: test using outdated mon_thousands_sep for Swedish 
Of course, we should expect a comma, not a period.
 2019-04-25 23:28:41 +02:00
Christoph M. Becker
3e31ae5d70 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77940: test using outdated mon_thousands_sep for Swedish
 2019-04-25 19:40:05 +02:00
Christoph M. Becker
bfbfb9dabd Fix #77940: test using outdated mon_thousands_sep for Swedish 
This time so that it works for all Windows 10 versions (hopefully).
 2019-04-25 19:39:42 +02:00
Christoph M. Becker
dcba479848 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77940: test using outdated mon_thousands_sep for Swedish
 2019-04-25 08:59:09 +02:00
Christoph M. Becker
37ca6a7a2a Fix #77940: test using outdated mon_thousands_sep for Swedish 2019-04-25 08:58:13 +02:00
Christoph M. Becker
ad0acc0aa9 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77938: socket_get_option error
 2019-04-25 00:04:37 +02:00
Christoph M. Becker
fe202d99c8 Fix #77938: socket_get_option error 
Since tcp_socket/ssl streams are not representable, we suppress the
redirect to fix the test case.
 2019-04-25 00:03:45 +02:00
Nikita Popov
cedee4408b Fixed bug #77931 2019-04-23 11:40:13 +02:00
Nikita Popov
a90ac8b5b2 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-08 13:00:05 +02:00
twosee
bdac9ef10d Preserve keys in emulate_read_fd_set() 
Keys are already preserved in the non-emulated case.
 2019-04-08 12:58:46 +02:00
Nikita Popov
08a3062816 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-08 11:41:48 +02:00
Nikita Popov
d7b5954f28 Fixed bug #77853 2019-04-08 11:40:50 +02:00
Nikita Popov
0a25b41f6d Merge branch 'PHP-7.2' into PHP-7.3 2019-04-08 11:12:52 +02:00
Nikita Popov
eea61cda7d Fixed bug #77844 
We should probably return an integer result from the operation in
typed mode, right now the result is always a string.
 2019-04-08 11:11:58 +02:00
Christoph M. Becker
9d8b913de5 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix test expectation
 2019-03-29 09:56:58 +01:00
Christoph M. Becker
0aa1a2c833 Fix test expectation 
The `W32_SM_SENDMAIL_FROM_MALFORMED` error message will only be shown
if the `$additional_headers` parameter is passed to `mail`, which is
not the case for this test.  Instead we have to expect `BAD_MSG_RPATH`.
 2019-03-29 09:55:04 +01:00
Nikita Popov
e4d9d91462 Merge branch 'PHP-7.2' into PHP-7.3 2019-03-25 17:45:03 +01:00
Vlad Temian
ec2ecb7e12 Fix bug #77680: Correctly implement recursive mkdir on FTP stream 
If the root directory was missing, an extra CWD without arguments was
made. Also, the MKD contained an empty string.

Now the CWD will use / and MKDs will be issued starting from the root
directory.
 2019-03-25 17:43:46 +01:00
Nikita Popov
e97577edde Fixed bug #77793 
By making sure that we always first increment the refcount of the
new value before we destroy the old one.
 2019-03-25 17:33:17 +01:00
Remi Collet
bb47fb0783 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  ensure pcre.jit=1 for these tests
 2019-03-22 15:01:49 +01:00
Remi Collet
2e9dccef78 ensure pcre.jit=1 for these tests 2019-03-22 15:00:31 +01:00
Remi Collet
5c8d69bf6f fix test 2019-03-21 09:19:42 +01:00
Remi Collet
cf65905974 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix tests after fix for #76717
 2019-03-20 14:08:18 +01:00
Remi Collet
a467a89f16 Fix tests after fix for #76717 2019-03-20 14:07:26 +01:00
Nikita Popov
d53e9c7392 Merge branch 'PHP-7.2' into PHP-7.3 2019-03-19 10:03:05 +01:00
Vlad Temian
fe2885d80a Fixed bug #77765 
Set mode 40755 for directories, via FTP stream stat.

Because we already manage to CWD into the current directory,
we should set 40755 as mode, instead of 40644.
 2019-03-19 10:02:38 +01:00
Nikita Popov
6818ca3c02 Merge branch 'PHP-7.2' into PHP-7.3 2019-03-11 15:36:27 +01:00
Nikita Popov
1fd32e9c2f Fixed bug #76717 
Print INT_MIN as -INT_MAX-1 to avoid it getting parsed as a float
literal due to integer overflow.
 2019-03-11 15:35:02 +01:00
Nikita Popov
019fd1d9ba Merge branch 'PHP-7.2' into PHP-7.3 2019-02-28 09:58:47 +01:00
Nikita Popov
9ad9cc71ff Fixed bug #77669 2019-02-28 09:58:01 +01:00
Xinchen Hui
3c3d59aa39 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)
 2019-02-25 14:42:01 +08:00
Xinchen Hui
4a72dd782d Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper) 2019-02-25 14:41:46 +08:00
Nikita Popov
af324e24df Fix issue mentioned in #77302 
Apparently Serializable::serialize() can return NULL, which is encoded
as N;. As we do not allow back-references to non-object values in
PHP 7.3 we need to make sure that any references are also compiled to
N;.
 2019-02-21 12:04:49 +01:00
Nikita Popov
5297bed454 Merge branch 'PHP-7.2' into PHP-7.3 2019-02-12 11:43:34 +01:00
DanielCiochiu
07877c46e3 Fixed bug #75546 
By respecting the SILENT flag when checking the visibility of a
class constant.
 2019-02-12 11:42:33 +01:00
Nikita Popov
2ea5a9cc64 Merge branch 'PHP-7.2' into PHP-7.3 2019-02-12 10:50:22 +01:00
Nikita Popov
8e34de4756 Fixed bug #77608 
Remove special handling of doubles and escape them as usual instead.
 2019-02-12 10:49:20 +01:00
Nikita Popov
be64a06b1c Merge branch 'PHP-7.2' into PHP-7.3 2019-02-11 11:33:04 +01:00