php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 18:22:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
101,631 Commits 547 Branches 1,481 Tags
5a9742e34b033dbbf98ede52feed41e6897199e3
Commit Graph

101631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
5a9742e34b Merge branch 'PHP-7.1' 
* PHP-7.1:
  add a primitive debug facility to sendmail
 2017-01-31 18:29:47 +01:00
Anatol Belski
d5f00717bf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  add a primitive debug facility to sendmail
 2017-01-31 18:28:29 +01:00
Anatol Belski
163bb87897 add a primitive debug facility to sendmail 2017-01-31 18:25:36 +01:00
Anatol Belski
0aa73a52b5 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Revert "backport 51e1da6ea1 into 7.0"
 2017-01-31 14:23:19 +01:00
Anatol Belski
2c0c704d43 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "backport 51e1da6ea1 into 7.0"
 2017-01-31 14:22:30 +01:00
Anatol Belski
5b5130c4ff Revert "backport 51e1da6ea1 into 7.0" 
This reverts commit 8da8756312.
 2017-01-31 14:21:20 +01:00
Joe Watkins
17b3e2e4a7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  bump versions
 2017-01-31 12:51:47 +00:00
Joe Watkins
6278a5aa7d Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  bump versions for next in dev
 2017-01-31 12:48:31 +00:00
Joe Watkins
c34bf0015b bump versions 2017-01-31 12:48:05 +00:00
Anatol Belski
fba9eb86ec Merge branch 'PHP-7.1' 
* PHP-7.1:
  bump versions for next in dev
 2017-01-31 11:21:01 +01:00
Anatol Belski
008e50a6f3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  bump versions for next in dev
 2017-01-31 11:20:10 +01:00
Anatol Belski
536b3ca1e1 bump versions for next in dev 2017-01-31 11:18:23 +01:00
Joe Watkins
3abb5a35f6 Merge branch 'PHP-7.1' 
* PHP-7.1:
  removed additional ";" from run-tests.php
 2017-01-31 05:36:28 +00:00
Joe Watkins
390134e6c5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  removed additional ";" from run-tests.php
 2017-01-31 05:36:16 +00:00
Rodrigo Prado
543141ae3b removed additional ";" from run-tests.php 2017-01-31 05:35:58 +00:00
Nikita Popov
a8d901a80c Remove zend_version() checks from tests 2017-01-30 22:50:25 +01:00
Nikita Popov
df404eccb5 Remove ZEND_CHANGES and README.namespaces 2017-01-30 22:50:25 +01:00
Anatol Belski
22ca84550a Merge branch 'PHP-7.1' 
* PHP-7.1:
  update NEWS
  update NEWS
 2017-01-30 22:36:56 +01:00
Anatol Belski
6a8e7d5408 update NEWS 2017-01-30 22:35:46 +01:00
Anatol Belski
7a89dd8067 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
 2017-01-30 22:35:14 +01:00
Anatol Belski
f39cabe610 update NEWS 2017-01-30 22:34:14 +01:00
Sara Golemon
f149f62d58 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Securely zero the hash context key
 2017-01-30 09:03:01 -08:00
Sara Golemon
3475c0c035 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Securely zero the hash context key
 2017-01-30 09:02:42 -08:00
Sara Golemon
bf0f53270f Securely zero the hash context key 2017-01-30 08:57:17 -08:00
Anatol Belski
46bdb637ec Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73983 crash on finish work with phar in cli + opcache
 2017-01-30 12:47:29 +01:00
Anatol Belski
de64adeb1d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73983 crash on finish work with phar in cli + opcache
 2017-01-30 12:46:11 +01:00
Anatol Belski
368958b3e4 Fixed bug #73983 crash on finish work with phar in cli + opcache 
The file_cache_only option causes the storage to be per process,
furthermore the arena is destroyed per request. Thus, zend_string's
can't survive between request and the permanent flag should not
be set. This is already done with the file cache part, but the
persistency part is used in various scenarios and should respect
this case as well. In this particular bug, the pcre pattern cache
needs to survive between requests and uses pattern strings as hash
keys. One more case relevant here would be various situations where
the flow disables the use of shared memory.
 2017-01-30 12:44:21 +01:00
Joe Watkins
82d363c21b Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
 2017-01-30 11:26:51 +00:00
Joe Watkins
e6bc4f39a2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
 2017-01-30 11:26:37 +00:00
Joe Watkins
dd227c2b23 Merge branch 'pull-request/2348' into PHP-7.0 
* pull-request/2348:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
 2017-01-30 11:26:02 +00:00
jhdxr
62938bf088 fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454) 2017-01-30 11:25:04 +00:00
Anatol Belski
04f150679c Merge branch 'PHP-7.1' 
* PHP-7.1:
  move id initialization into ctor
 2017-01-30 11:42:46 +01:00
Anatol Belski
f2c99e201e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  move id initialization into ctor
 2017-01-30 11:41:59 +01:00
Anatol Belski
4b1afc829c move id initialization into ctor 2017-01-30 11:40:23 +01:00
Anatol Belski
2370183429 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix system id initialization for multiple threads
 2017-01-30 01:59:02 +01:00
Anatol Belski
2a5a310446 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix system id initialization for multiple threads
 2017-01-30 01:57:27 +01:00
Anatol Belski
2b7e5468c9 fix system id initialization for multiple threads 2017-01-30 01:54:36 +01:00
Jakub Zelenka
10cd88588e Merge branch 'PHP-7.1' 2017-01-29 20:46:20 +00:00
Jakub Zelenka
1dab39b9aa Merge branch 'PHP-7.0' into PHP-7.1 2017-01-29 20:44:51 +00:00
Jakub Zelenka
df16579642 Try fpm path for testing in sbin as it is default target 2017-01-29 20:43:58 +00:00
Joe Watkins
f007e9ff8c Merge branch 'pull-request/2345' 
* pull-request/2345:
  FTP: implement MLSD for structured listing of directories, decribed at https://tools.ietf.org/html/rfc3659
 2017-01-29 07:30:25 +00:00
Andreas Treichel
0103d1e3bc FTP: implement MLSD for structured listing of directories, decribed at https://tools.ietf.org/html/rfc3659 2017-01-29 07:28:22 +00:00
Joe Watkins
3de7b2ab52 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)
 2017-01-28 08:28:31 +00:00
Joe Watkins
366f838483 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)
 2017-01-28 08:27:53 +00:00
jhdxr
2fcf1259c6 fixed bug #50989 (DOM support for LIBXML_NOXMLDECL) 2017-01-28 08:27:05 +00:00
Joe Watkins
47c2da9646 [ci skip] news entry for Fixed bug #73987 2017-01-28 06:47:59 +00:00
Joe Watkins
19fff2ece6 [ci skip] news entry for Fixed bug #73987 2017-01-28 06:46:43 +00:00
Joe Watkins
c827124632 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Added tests demonstrating the same effect with abstracts
  Inheritance checks should not ignore parents if these implement an interface
 2017-01-28 06:28:24 +00:00
Pedro Magalhães
c11b2b809d Added tests demonstrating the same effect with abstracts 2017-01-28 06:28:14 +00:00
Pedro Magalhães
b67eb3440b Inheritance checks should not ignore parents if these implement an interface 2017-01-28 06:28:10 +00:00