php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 05:21:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,987 Commits 547 Branches 1,483 Tags
9f09c810f5b45690fd2c04e6766a9bd6ffecfac6
Commit Graph

99987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Jones
9f09c810f5 Update NEWs 2017-03-02 15:34:47 +11:00
Christopher Jones
06e5ec9e32 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 15:33:25 +11:00
Christopher Jones
e80ea04c79 Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated) 
This was a modification of an incomplete PR #2276.
 2017-03-02 15:28:01 +11:00
Derick Rethans
1b16fb594f Updated to version 2017.1 (2017a) 2017-03-01 20:07:51 +00:00
Derick Rethans
dfcb11d7d1 Updated to version 2017.1 (2017a) 2017-03-01 20:07:51 +00:00
Derick Rethans
36d8c1b182 Empty merge 2017-03-01 20:07:51 +00:00
Remi Collet
2f955d5d0a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  make type consistent with glob_t.gl_pathc
 2017-03-01 17:02:42 +01:00
Remi Collet
53a08fd07d make type consistent with glob_t.gl_pathc 2017-03-01 17:01:58 +01:00
Sara Golemon
c5727a30cf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix potential crash when setting invalid declare value
 2017-02-28 17:17:41 -08:00
Sara Golemon
868930e079 Fix potential crash when setting invalid declare value 
Using a non-literal expression in a declare value can cause the
compiler to crash trying to turn that AST node into a usable zval.

There was an existing test for such values using 'encoding',
but that didn't crash because it's handled by the lexer
rather than being compiled.

Trying to use a non-literal with ticks reproduces the crash.
 2017-02-28 17:08:23 -08:00
Remi Collet
3006d1de5b make test slower again 2017-02-28 11:36:24 +01:00
Joe Watkins
55bcef1751 prepare 7.1.4 2017-02-28 09:08:05 +00:00
Anatol Belski
52393daa3a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  prepare next
 2017-02-28 09:47:56 +01:00
Anatol Belski
21a05b0418 prepare next 2017-02-28 09:46:11 +01:00
Joe Watkins
585ea4cda0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "fix crash in phpdbg shutdown process when opcache is loaded"
 2017-02-27 19:21:37 +00:00
Joe Watkins
c564924d31 Revert "fix crash in phpdbg shutdown process when opcache is loaded" 
This reverts commit 008fb28eaf.
 2017-02-27 19:21:10 +00:00
Joe Watkins
7aa59a4440 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix crash in phpdbg shutdown process when opcache is loaded
 2017-02-27 17:55:14 +00:00
Joe Watkins
008fb28eaf fix crash in phpdbg shutdown process when opcache is loaded 2017-02-27 17:54:48 +00:00
Xinchen Hui
59acca2062 Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Improve fix for bug #73807
 2017-02-26 12:06:29 +08:00
Xinchen Hui
6a584cf318 Fixed bug #74157 (Segfault with nested generators) 2017-02-26 12:05:56 +08:00
Nikita Popov
846bea7f05 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-25 12:57:53 +01:00
Nikita Popov
bbfa1b6419 Improve fix for bug #73807 
At least on some architectures memmove() on FreeBSD does not
short-curcuit if src==dst. Check for it explicitly to avoid
quadratic copying.
 2017-02-25 12:55:14 +01:00
Xinchen Hui
36fcc4cb5d Fixed bug #74164 (PHP hangs when an invalid value is dynamically passed to typehinted by-ref arg) 2017-02-25 12:00:42 +08:00
Xinchen Hui
d1f36d6d8e Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Fix bug #73127
  Support run or test target invoked within debugger
  Update test for bug #74159
  Update NEWS
  Fix bug #74159
 2017-02-25 11:10:37 +08:00
Nikita Popov
f678b0eae2 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-24 23:22:24 +01:00
Grundik
eac8166bd4 Fix bug #73127 
gost-crypto hash was incorrect if input data contained long 0xFF
sequence, due to a carry-propagation bug.
 2017-02-24 23:20:49 +01:00
Anatol Belski
0ceedea2cc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Support run or test target invoked within debugger
 2017-02-24 19:41:30 +01:00
Anatol Belski
9450e23b32 Support run or test target invoked within debugger 
Useful, as it gets all the environment produced by the makefile. For the
test target, it might make sense to have the child process debug plugin
for VS installed.
 2017-02-24 19:37:16 +01:00
Aaron Piotrowski
531fbb88f5 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-23 22:56:04 -06:00
Aaron Piotrowski
ff8a6b1232 Update test for bug #74159 2017-02-23 22:24:59 -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
afca29c436 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed typo (it should be typo)
 2017-02-23 13:58:51 +08:00
Xinchen Hui
d2f384a47b Fixed typo (it should be typo) 2017-02-23 13:58:08 +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
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
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
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
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
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
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