clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 22:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
97,245 Commits 494 Branches 1,367 Tags 790 MiB
3d95cc50a7
Commit Graph

97245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter Hordijk
f813f43855 Removed incorrect (leftover?) sentence in ini 
about mbstring or iconv output handler
 2016-07-21 16:49:14 +02:00
Christoph M. Becker
8950fb42d9 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-21 16:33:06 +02:00
Christoph M. Becker
bee362d5e3 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-21 16:31:16 +02:00
Pieter Hordijk
82bfb090ac Removed incorrect (leftover?) sentence in ini 
about mbstring or iconv output handler
 2016-07-21 16:28:48 +02:00
Davey Shafik
a10d873cee Update NEWS for 7.1.0beta1 2016-07-21 01:56:38 -07:00
Remi Collet
a2a122804e bump zip extension version 2016-07-21 08:44:26 +02:00
Remi Collet
7ac330d63a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  bump zip extension version
 2016-07-21 08:43:49 +02:00
Remi Collet
61ce933d38 bump zip extension version 2016-07-21 08:42:53 +02:00
Xinchen Hui
8ec50677fa Update NEWS 2016-07-21 14:25:54 +08:00
Xinchen Hui
bdd3f77be0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property)
 2016-07-21 14:25:36 +08:00
Xinchen Hui
4a643e5e13 Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property) 2016-07-21 14:25:15 +08:00
Davey Shafik
c9af9c78f1 Prepare NEWS for beta2 2016-07-20 20:07:35 -07:00
Anatol Belski
a8b105b412 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update libs_version.txt
  update libs_versions.txt
 2016-07-21 01:56:55 +02:00
Anatol Belski
7e1843fc04 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update libs_versions.txt
 2016-07-21 01:55:42 +02:00
Anatol Belski
e7168519dd update libs_version.txt 2016-07-21 01:54:53 +02:00
Anatol Belski
8b191921c3 update libs_versions.txt 2016-07-21 01:52:03 +02:00
Ferenc Kovacs
f9ee0040e5 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-21 00:38:11 +02:00
Ferenc Kovacs
027a82e4e6 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-21 00:37:41 +02:00
Ferenc Kovacs
c9f21e8319 update NEWs 2016-07-21 00:36:07 +02:00
Davey Shafik
201c8438ad Update NEWS for RFC: Additional Context in pcntl_signal Handler 2016-07-20 14:48:15 -07:00
Davey Shafik
57092c5a68 Merge RFC Additional Context in pcntl_signal Handler 2016-07-20 14:17:04 -07:00
Jakub Zelenka
5507fbe6af Update NEWS with fixed OpenSSL 1.1 build 2016-07-20 19:34:30 +01:00
Jakub Zelenka
e7ee24bf6d Merge branch 'openssl_1_1_port' 2016-07-20 19:32:07 +01:00
Christoph M. Becker
f3a89ff075 Add test case for imagecopyresampled() with alpha 2016-07-20 19:26:29 +02:00
Anatol Belski
be53fab51a Merge branch 'PHP-7.0' 
* PHP-7.0:
  regenerate date parser with re2c 0.13.5 to fix OSX issues
 2016-07-20 18:01:41 +02:00
Anatol Belski
462a9aa190 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  regenerate date parser with re2c 0.13.5 to fix OSX issues
 2016-07-20 18:00:53 +02:00
Anatol Belski
b57a38f584 regenerate date parser with re2c 0.13.5 to fix OSX issues 2016-07-20 17:57:39 +02:00
Anatol Belski
c1ca3c5e6d Merge branch 'PHP-7.0' 
* PHP-7.0:
  regenerate date parser with re2c 0.13.5
 2016-07-20 13:37:17 +02:00
Anatol Belski
90c26fb6b1 regenerate date parser with re2c 0.13.5 2016-07-20 13:32:53 +02:00
Xinchen Hui
6e16ea4135 Fixed arginfo 2016-07-20 18:09:17 +08:00
Xinchen Hui
d169fccae2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed arginfo
 2016-07-20 18:08:48 +08:00
Xinchen Hui
e4af29b0b7 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed arginfo
 2016-07-20 18:07:18 +08:00
Xinchen Hui
9ebc96116b Fixed arginfo 2016-07-20 18:07:02 +08:00
Derick Rethans
533266127a Merge branch 'PHP-7.0' 2016-07-20 10:21:19 +01:00
Derick Rethans
1dafa806a9 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-20 10:21:03 +01:00
Derick Rethans
18ba78e988 Regenerate with the -b flag, as we used to do. 
Apparently, Apple's LLVM can't handle it otherwise o_O.
 2016-07-20 10:19:53 +01:00
Xinchen Hui
5296853fff Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed typo
 2016-07-20 17:01:53 +08:00
Xinchen Hui
cbbe17fb53 Fixed typo 2016-07-20 17:01:42 +08:00
Xinchen Hui
f2fa45062e Update NEWs 2016-07-20 17:00:30 +08:00
Xinchen Hui
9254f5d5d3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72629 (Caught exception assignment to variables ignores references).

Conflicts:
	main/php_version.h
 2016-07-20 17:00:09 +08:00
Xinchen Hui
97c0b133c5 Fixed bug #72629 (Caught exception assignment to variables ignores references). 2016-07-20 16:59:14 +08:00
Xinchen Hui
07b869f367 Update NEWS 2016-07-20 16:13:21 +08:00
Xinchen Hui
c35dab005c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72622 (array_walk + array_replace_recursive create references from nothing)
 2016-07-20 16:12:49 +08:00
Xinchen Hui
3c3b8c8365 Fixed bug #72622 (array_walk + array_replace_recursive create references from nothing) 2016-07-20 16:12:37 +08:00
Stanislav Malyshev
dda0ea9b3a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Improve fix for #72520
  #72482, revert for 5.6 for now
 2016-07-19 22:38:54 -07:00
Stanislav Malyshev
df5ee7bc25 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Improve fix for #72520
  #72482, revert for 5.6 for now

Conflicts:
	ext/zip/zip_stream.c
 2016-07-19 22:38:35 -07:00
Stanislav Malyshev
17a53f9e60 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improve fix for #72520
 2016-07-19 22:37:44 -07:00
Stanislav Malyshev
8ebdb1f5fd Improve fix for #72520 2016-07-19 22:37:03 -07:00
Jakub Zelenka
98ac90b7e2 Add missing X509_get_signature_nid for 1.0.1 2016-07-19 20:13:13 +01:00
Jakub Zelenka
d8580cb286 Use always non const SSL cipher version string 2016-07-19 20:01:20 +01:00