php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
101,860 Commits 549 Branches 1,485 Tags
b59f3cf1679a5bc3c4f1466f81596cffbe6bf7ed
Commit Graph

101860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski b59f3cf167 use the delivered global arg instead of fetching it 2017-02-21 12:12:42 +01:00
Dmitry Stogov 298b62af47 Merge branch 'PHP-7.1' 
* PHP-7.1:
  too many dashes
 2017-02-21 10:48:37 +03:00
Dmitry Stogov 500232ef35 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  too many dashes
 2017-02-21 10:48:21 +03:00
Dmitry Stogov 593a4d8fe9 too many dashes 2017-02-21 10:47:48 +03:00
Dmitry Stogov 3f2c8d30cd Merge branch 'PHP-7.1' 
* PHP-7.1:
  Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5) Include WSDL cache version number into file name
 2017-02-21 10:42:59 +03:00
Dmitry Stogov 508d78ce5e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5) Include WSDL cache version number into file name
 2017-02-21 10:42:42 +03:00
Dmitry Stogov bd7e5c1548 Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5) 
Include WSDL cache version number into file name
 2017-02-21 10:41:20 +03:00
Remi Collet 8f8fb92cd0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test for libzip 1.2.0
 2017-02-19 17:02:31 +01:00
Remi Collet dd9701c414 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test for libzip 1.2.0
 2017-02-19 17:02:16 +01:00
Remi Collet c836ad1c7e fix test for libzip 1.2.0 2017-02-19 17:02:00 +01:00
Anatol Belski 0c28332b11 Merge branch 'PHP-7.1' 
* PHP-7.1:
  initialize valid_symbol_table, important for the main thread
 2017-02-18 18:05:55 +01:00
Anatol Belski ac64eea9e6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  initialize valid_symbol_table, important for the main thread
 2017-02-18 18:03:55 +01:00
Anatol Belski 1623ef10c9 initialize valid_symbol_table, important for the main thread 
to prevent php_errormsg population on invalid symlol_table
 2017-02-18 17:58:17 +01:00
Andreas Treichel 5b1300b6c9 ftp_mlsd(): Parse the MLSD response 2017-02-17 21:31:18 +01:00
Nikita Popov efefb5276b Merge branch 'PHP-7.1' 2017-02-17 21:23:31 +01:00
andrewnester 15b8b124ae Fixed #74099 - Memory leak with openssl_encrypt() 2017-02-17 21:23:16 +01:00
Nikita Popov 5da004cc75 Merge branch 'PHP-7.1' 2017-02-17 18:44:10 +01:00
Nikita Popov c240feb7f4 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-17 18:44:02 +01:00
Benjamin Robin 513582814b Fixed bug #74105 
If getrandom syscall is unavailable (ENOSYS), try to fallback on
/dev/urandom.
 2017-02-17 18:42:35 +01:00
Xinchen Hui df3ee2bb2f Merge branch 'PHP-7.1' 
* PHP-7.1:
  Unused var
 2017-02-17 12:23:14 +08:00
Xinchen Hui aa1d92e3e5 Unused var 2017-02-17 12:22:59 +08:00
Nikita Popov f3d058c1da Merge branch 'PHP-7.1' 2017-02-16 17:36:09 +01:00
Nikita Popov 9ca43b873a Merge branch 'PHP-7.0' into PHP-7.1 2017-02-16 17:36:03 +01:00
Ondřej Surý 61e59db99d Disable RTLD_DEEPBIND when compiling with AddressSanitizer (-fsanitize=address). 
The AddressSanitizer doesn't support RTLD_DEEPBIND resulting in
erratic errors when deinitializing phar module and possibly others.

Clang use __has_feature() macro to indicate compilation with
AddressSanitizer while gcc uses __SANITIZE_ADDRESS__ define.

Fixes bug #73677.
 2017-02-16 17:35:29 +01:00
Nikita Popov 46bfad56be Merge branch 'PHP-7.1' 2017-02-16 17:28:14 +01:00
Nikita Popov 976225ef23 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-16 17:28:05 +01:00
Nikita Popov cf3ef36323 Fix memory errors in url rewriter 
Strings aren't terminated here...
 2017-02-16 17:24:07 +01:00
Nikita Popov a83f9726ab Merge branch 'PHP-7.1' 2017-02-16 17:00:28 +01:00
Nikita Popov a381b61f03 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-16 17:00:21 +01:00
Nikita Popov 708973c9bd Fix autoload_func_info destruction 
Can't reference the function ptr after the closure has been
destroyed.
 2017-02-16 16:59:17 +01:00
Nikita Popov 267ab47366 Merge branch 'PHP-7.1' 2017-02-16 12:47:26 +01:00
Nikita Popov f741f9b656 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-16 12:47:12 +01:00
Mitch Hagstrand 3b91ed112f Make the ftp and stream tests more reliable. 
The tests can sometimes fail because it chooses a passive port for ftp that
is already in use. This makes the test attempt multiple times to find a free
port.
 2017-02-16 12:46:55 +01:00
Nikita Popov 5432d6f982 Add json dep to test 2017-02-16 12:45:24 +01:00
Anatol Belski 0d450ddbec Merge branch 'PHP-7.1' 
* PHP-7.1:
  [ci skip] update NEWS
  [ci skip] update NEWS
 2017-02-15 16:37:15 +01:00
Anatol Belski bf4fdda1a8 [ci skip] update NEWS 2017-02-15 16:35:49 +01:00
Anatol Belski f1b36e7e35 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] update NEWS
 2017-02-15 16:35:11 +01:00
Anatol Belski e79754dee3 [ci skip] update NEWS 2017-02-15 16:33:49 +01:00
Anatol Belski 46df51132a fix typo 2017-02-15 16:15:16 +01:00
Anatol Belski e35376c1e2 Merge branch 'PHP-7.1' 
* PHP-7.1:
  skip test
 2017-02-15 16:14:46 +01:00
Anatol Belski 8ad75bec97 skip test 
The code path not available on Windows.
 2017-02-15 16:12:34 +01:00
Anatol Belski e7b4ee3165 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string
 2017-02-15 14:51:38 +01:00
Anatol Belski 2a61e5495a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string
 2017-02-15 14:49:58 +01:00
Anatol Belski 89a5bd6750 Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string 2017-02-15 11:22:47 +01:00
Xinchen Hui b4fd233be0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed test in travis
 2017-02-15 17:31:35 +08:00
Xinchen Hui f53ea4cd60 Fixed test in travis 2017-02-15 17:31:27 +08:00
Xinchen Hui 41bd2087ea Merge branch 'PHP-7.1' 
* PHP-7.1:
  Make it slower
 2017-02-15 15:27:33 +08:00
Xinchen Hui 8d94d5d942 Make it slower 2017-02-15 15:27:21 +08:00
Xinchen Hui 49dca87029 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed test
 2017-02-15 14:49:09 +08:00
Xinchen Hui dad5281a89 Fixed test 2017-02-15 14:49:02 +08:00