php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity
109,600 Commits 549 Branches 1,485 Tags
ad6060601ae6e542e86f01067f483ddbef1c59f9
Commit Graph

109600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet ad6060601a Merge branch 'PHP-7.3' 
* PHP-7.3:
  NEWS
  NEWS
  NEWS
  Fix #77151 ftp_close(): SSL_read on shutdown
 2018-11-20 11:20:57 +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
Dmitry Stogov 1f3a535324 Delay exceptional case check 2018-11-20 13:06:23 +03:00
Dmitry Stogov 93f7cbf29b fixed typo 2018-11-20 12:53:05 +03:00
Dmitry Stogov a5a3d507d2 Optimization 2018-11-20 11:55:16 +03:00
Fabien Villepinte 2b9ceffb41 Fix typo in tests 2018-11-19 22:17:58 +01:00
Anatol Belski e00add198c Merge branch 'PHP-7.3' 
* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-11-18 14:41:44 +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 b6367ebae3 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
 2018-11-18 12:34: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 8b05bbdd0a Merge branch 'PHP-7.3' 
* PHP-7.3:
  Add test for bug #77047
  FIX #77047: fixes regex for "time" data type
 2018-11-18 11:52:33 +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 819f857894 Merge branch 'PHP-7.3' 
* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-11-17 23:03:14 +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 3c4cf40064 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Simplify assignment on 64-bit
 2018-11-17 22:57:16 +01:00
Anatol Belski b0591f5e46 Simplify assignment on 64-bit 2018-11-17 22:56:39 +01:00
Anatol Belski b0cf54c5b8 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fixed bug #77111 php-win.exe corrupts unicode symbols from cli parameters
 2018-11-16 23:23:00 +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 2fac9d9ec1 Remove some mentions of RECOVERABLE_ERROR in tests 
Mostly drop error handlers that are no longer necessary.
 2018-11-15 22:13:46 +01:00
Nikita Popov 2766a8e66b Fix leaks 
For some reason I'm no longer getting memory leak errors for my
local build :/
 2018-11-15 21:34:46 +01:00
Nikita Popov 022eea8be1 Check for zero SplPriorityQueue extract flags earlier 
Generate an exception during the SplPriorityQueue::setExtracFlags()
call instead of generating E_RECOVERABLE_FATAL all over the place
later.
 2018-11-15 21:05:05 +01:00
Nikita Popov e965fee904 Optimize SplPriorityQueue implementation 
Do not create an array with two keys for every element. That's a
huge waste of memory. Instead we allocate a two-element structure.
This reduces memory usage and avoids having to perform hashtable
lookups to get at the data and priority.

The only thing this might impact negatively is the non-default
EXTR_BOTH mode, in which case the array has to be created anyway.
 2018-11-15 20:52:01 +01:00
Dmitry Stogov 0f7f1498be Use ZEND_THIS macro to hide implementation details in extensions code. 2018-11-15 19:54:19 +03:00
Nikita Popov 8f2f80668e Merge branch 'PHP-7.3' 2018-11-15 17:17:06 +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
Dmitry Stogov 71d6899e53 micro-optimization 2018-11-15 18:47:23 +03:00
Gabriel Caruso 5ae1524dc3 Remove unused variables 2018-11-15 12:32:00 -02:00
Gabriel Caruso 74f26ba816 Remove missing SKIPIF sections for mbstring tests 2018-11-15 12:21:55 -02:00
Dmitry Stogov 9ab3b42888 Split zend_objects_store_put() into hot/cold parts 2018-11-15 16:31:22 +03:00
Peter Kokot 35a9ec1b0d [ci skip] Update UPGRADING 2018-11-15 10:46:48 +01:00
Anatol Belski 164edffb99 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Rework magic data once more
 2018-11-14 22:35:47 +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
Dmitry Stogov d5955d9587 typo 2018-11-15 00:10:17 +03:00
Peter Kokot 698f8bec93 [ci skip] Update NEWS 2018-11-14 21:45:24 +01:00
Ben Scholzen (DASPRiD) ee939b70d3 Add openssl_x509_verify() function 
This patch introduces a wrapper around OpenSSL's X509_verify() function.
 2018-11-14 21:40:34 +01:00