php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
101,882 Commits 549 Branches 1,485 Tags
fb76d81b6caef050277941d781d4f09de3e9496d
Commit Graph

101882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Piotrowski fb76d81b6c Merge branch 'PHP-7.1' 2017-02-23 21:22:28 -06:00
Aaron Piotrowski c05c65ac80 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-23 21:19:46 -06:00
Aaron Piotrowski cc10515056 Update NEWS 2017-02-23 21:10:14 -06:00
Aaron Piotrowski e9873d9853 Fix bug #74159 
Thanks to @brzuchal for the patch to xp_ssl.c and @DaveRandom for helping debug the problem.
 2017-02-23 20:59:43 -06:00
Xinchen Hui 1a1b722b5c Merge branch 'PHP-7.1' 
* PHP-7.1:
  Add test only (bug doesn't exists in 7.1)
  Fixed bug #74152 (if statement says true to a null variable)
 2017-02-23 12:47:40 +08:00
Xinchen Hui be60d159b6 Add test only (bug doesn't exists in 7.1) 2017-02-23 12:47:15 +08:00
Xinchen Hui 002680d0d5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74152 (if statement says true to a null variable)
 2017-02-23 12:47:04 +08:00
Xinchen Hui 330a7b62c3 Fixed bug #74152 (if statement says true to a null variable) 2017-02-23 12:33:17 +08:00
Xinchen Hui b717c7ffb0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
 2017-02-23 11:02:48 +08:00
Xinchen Hui 48fcc5ddc2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
 2017-02-23 11:02:37 +08:00
Xinchen Hui 1d4eead995 Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments) 2017-02-23 11:02:23 +08:00
Kalle Sommer Nielsen db982bbaa1 Fix PHP_OS_FAMILY for Linux (Joe) 2017-02-22 22:13:33 +01:00
Kalle Sommer Nielsen f9959ee7c2 Change PHP_OS_FAMILY slightly 
* PHP_OS_FAMILY is now a macro, to allow extensions to take advantage of it, it is defined in php.h
* Values are not upper-case-first, not always uppercase. Windows is no longer just "Win", if we want the short version for testing then PHP_OS is always WINNT anyway
 2017-02-22 12:31:06 +01:00
Kalle Sommer Nielsen dbdb0819b2 Fix extra ; causing a build error 2017-02-22 12:09:59 +01:00
Remi Collet 93cba7ab47 Merge branch 'PHP-7.1' 
* PHP-7.1:
  report about OpenSSL 1.1 not supported during configure
 2017-02-22 08:41:01 +01:00
Remi Collet d444e017fb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  report about OpenSSL 1.1 not supported during configure
 2017-02-22 08:40:22 +01:00
Remi Collet 015a80ef7b report about OpenSSL 1.1 not supported during configure 2017-02-22 08:39:07 +01:00
Joe Watkins 78ae563a48 Merge branch 'PHP-7.1' 
* PHP-7.1:
  pull-request/2393:
    stop fpm make install clobbering dot d configuration
 2017-02-22 06:49:22 +00:00
Joe Watkins 46d0933668 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  pull-request/2393:
    stop fpm make install clobbering dot d configuration
 2017-02-22 06:48:48 +00:00
Coenraad Loubser 9eaf551c86 pull-request/2393: 
stop make install from clobbering default dot d configuration
 2017-02-22 06:47:23 +00:00
Anatol Belski 41d2944b0a more appropriate var name 2017-02-21 14:37:42 +01:00
Anatol Belski 42a8f0755c add folds 2017-02-21 14:36:06 +01:00
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