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
108,883 Commits 547 Branches 1,483 Tags
efeb810a3dd409dfb611ca8e6e1e1dd51ae90c92
Commit Graph

108883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
efeb810a3d Fixed proto & folder mark 2018-11-21 11:18:48 +08:00
Nikita Popov
b6d5d92661 Merge branch 'PHP-7.2' into PHP-7.3 2018-11-20 21:30:53 +01:00
Nikita Popov
bbbaf1ca85 Merge branch 'PHP-7.1' into PHP-7.2 2018-11-20 21:30:38 +01:00
Valentin V. Bartenev
11ddf7669a Fix bug #71041 dynamic embed SAPI load error 
If the library is built with ZEND_SIGNALS defined, it's unusable with an
external SAPI module because the zend_signal_startup() call is mandatory
in this case.

This bug is similar to #74149, but related to dynamic loading of PHP library.
 2018-11-20 21:30:02 +01:00
Nikita Popov
7a0d3406f6 Merge branch 'PHP-7.2' into PHP-7.3 2018-11-20 21:16:28 +01:00
Mizunashi Mana
e672cd4385 Define __APPLE_USE_RFC_3542 for new ipv6 constants 2018-11-20 21:16:03 +01:00
Sara Golemon
7d766bd657 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Bump for 7.2.14
 2018-11-20 14:41:31 -05:00
Sara Golemon
9fc52c16b5 Bump for 7.2.14 2018-11-20 14:40:21 -05:00
Stanislav Malyshev
63973d1b33 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Disable rsh/ssh functionality in imap by default (bug #77153)
 2018-11-20 11:20:45 -08:00
Stanislav Malyshev
44b08a9802 Disable rsh/ssh functionality in imap by default (bug #77153) 2018-11-20 11:19:45 -08:00
Stanislav Malyshev
336d2086a9 Disable rsh/ssh functionality in imap by default (bug #77153) 2018-11-20 11:18:53 -08:00
Stanislav Malyshev
05782f01f5 Disable rsh/ssh functionality in imap by default (bug #77153) 2018-11-20 11:16:08 -08:00
Christoph M. Becker
03a3a04e55 [ci skip] Update NEWS wrt. php-7.3.0RC6 tagging 2018-11-20 13:36:10 +01:00
Remi Collet
3ed07cc34a NEWS 2018-11-20 11:20:40 +01:00
Remi Collet
928d7fc8df Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  NEWS
  NEWS
  Fix #77151 ftp_close(): SSL_read on shutdown
 2018-11-20 11:20:26 +01:00
Remi Collet
e7acb29eb0 NEWS 2018-11-20 11:20:05 +01:00
Remi Collet
6ce4be1762 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  NEWS
  Fix #77151 ftp_close(): SSL_read on shutdown
 2018-11-20 11:19:52 +01:00
Remi Collet
1adbf70e26 NEWS 2018-11-20 11:19:29 +01:00
Remi Collet
d9afc2f662 Fix #77151 ftp_close(): SSL_read on shutdown 
Regression introduced in fix for #76972

only display the error message when sslerror
or if errno is set (for SSL_ERROR_SYSCALL case)
 2018-11-20 11:18:34 +01:00
Anatol Belski
05df19b9f0 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-11-18 14:41:14 +01:00
Anatol Belski
68442312e3 [ci skip] Update NEWS 2018-11-18 14:40:00 +01:00
Anatol Belski
6742b4b7cc [ci skip] Update NEWS 2018-11-18 14:38:35 +01:00
Anatol Belski
6e32f59525 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
 2018-11-18 14:37:56 +01:00
Anatol Belski
3e78380d02 [ci skip] Update NEWS 2018-11-18 14:37:04 +01:00
Anatol Belski
5f64afc073 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
 2018-11-18 12:33:35 +01:00
Anatol Belski
fb06cca6cb Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
 2018-11-18 12:32:47 +01:00
Anatol Belski
0434141ce9 Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type 
Backport 369c991d and 282a63da to 7.1, closes #3634
 2018-11-18 12:29:34 +01:00
Anatol Belski
282a63dace Add test for bug #77047 2018-11-18 11:52:00 +01:00
andy
369c991d5c FIX #77047: fixes regex for "time" data type 2018-11-18 11:50:32 +01:00
Anatol Belski
cf764f02b3 [ci skip] Update NEWS 2018-11-17 23:01:17 +01:00
Anatol Belski
10192a9ca4 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  [ci skip] Update NEWS
 2018-11-17 23:00:50 +01:00
Anatol Belski
b4776cda2e [ci skip] Update NEWS 2018-11-17 23:00:12 +01:00
Anatol Belski
b0591f5e46 Simplify assignment on 64-bit 2018-11-17 22:56:39 +01:00
Anatol Belski
00c08a2e4a Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #77111 php-win.exe corrupts unicode symbols from cli parameters
 2018-11-16 23:22:19 +01:00
Anatol Belski
a7e9790969 Fixed bug #77111 php-win.exe corrupts unicode symbols from cli parameters 
The binary can be of course used on console, for whatever reasons, so
UNICODE API should be used in that case. That might however not work as
expected, if the binary is used for a service.
 2018-11-16 23:19:33 +01:00
Nikita Popov
dee5a450d9 Fixed bug #77165 
Also add some helper macros for PROTECT/UNPROTECT that check for
IMMUTABLE. These checks are needed for nearly any use of
PROTECT/UNPROTECT.
 2018-11-15 17:16:39 +01:00
Anatol Belski
2a062f3c02 Rework magic data once more 
The change reduces the input size on patterns using posix character
classes. It is still better than reverting to the patterns from the
older version, as the upstream data uses posix classes also in the later
versions. The input reduction speeds up the pattern matching in some
cases.

This patch is functionally almost same as upstream, but might show some diff
when the input is very long. While the magic data in the newer versions is
functionally an improvement, with jit=0 it might show a performance regression.
The slowdown is negligible in the normal usage and is still acceptable for the
malicious input. If some functional regressions show up, this patch should be
reverted and the tests timing should be adapted instead.
 2018-11-14 22:23:24 +01:00
Christoph M. Becker
9a2bd2f453 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
 2018-11-14 14:59:30 +01:00
Christoph M. Becker
211c6189f6 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
 2018-11-14 14:57:40 +01:00
Christoph M. Becker
a56cdd0a82 Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR 
If the `ICONV_MIME_DECODE_CONTINUE_ON_ERROR` flag is set, parsing
should not fail, if there are illegal characters in the headers;
instead we silently ignore these like before.
 2018-11-14 14:55:38 +01:00
Joe Watkins
8a11c9ee76 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Validate length on socket_write
 2018-11-13 13:00:08 +01:00
Joe Watkins
ce4eb89976 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Validate length on socket_write
 2018-11-13 12:58:23 +01:00
Thiago Carvalho
ec2e7a2d48 Validate length on socket_write 2018-11-13 12:56:37 +01:00
Jan Rękorajski
f76be1a0d6 Fix compilation on x32 
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
 2018-11-13 12:31:00 +01:00
Christoph M. Becker
512b93e9d6 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77141: Signedness issue in SOAP when precision=-1
 2018-11-12 23:24:48 +01:00
Christoph M. Becker
77646d2fd9 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #77141: Signedness issue in SOAP when precision=-1
 2018-11-12 23:22:16 +01:00
Christoph M. Becker
f6079e3c56 Fix #77141: Signedness issue in SOAP when precision=-1 
According to php_gcvt(), we assume at most 17 fractional digits for
negative precision.
 2018-11-12 23:19:30 +01:00
Anatol Belski
ee50461e4b Update libmagic.patch [ci skip] 2018-11-10 22:02:44 +01:00
Anatol Belski
df9c58e27a Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update libmagic.patch [ci skip]
 2018-11-10 22:02:24 +01:00
Anatol Belski
1550451020 Update libmagic.patch [ci skip] 2018-11-10 22:01:49 +01:00