clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,454 Commits 494 Branches 1,367 Tags 802 MiB
0a13f8168d
Commit Graph

79454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
0a13f8168d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #64604
 2014-04-13 18:39:28 -07:00
Stanislav Malyshev
0d4c28f2e1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #64604
 2014-04-13 18:39:17 -07:00
Stanislav Malyshev
30ec1c0051 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64604
 2014-04-13 18:38:36 -07:00
Ingo Walz
b05c088a3a Fixed bug #64604 2014-04-13 18:37:40 -07:00
Stanislav Malyshev
aa3cc443c3 Merge branch 'pull-request/578' 
* pull-request/578:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
 2014-04-13 18:15:55 -07:00
Stanislav Malyshev
85d05b5654 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
 2014-04-13 18:14:10 -07:00
Stanislav Malyshev
1ef0bd2633 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
 2014-04-13 18:13:52 -07:00
Stanislav Malyshev
f1206aef70 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
 2014-04-13 18:13:09 -07:00
Freek
5558d0db9b Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec 
curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency
 2014-04-13 18:12:17 -07:00
Stanislav Malyshev
d3b433bb15 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
 2014-04-13 17:33:02 -07:00
Stanislav Malyshev
c1d5937f7f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
 2014-04-13 17:32:42 -07:00
Stanislav Malyshev
5811610d71 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
 2014-04-13 17:31:44 -07:00
itxx00
636adf251c Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf 2014-04-13 17:30:50 -07:00
Stanislav Malyshev
3a3a05d2e8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix windows build
 2014-04-13 17:04:25 -07:00
Stanislav Malyshev
04a11b850a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix windows build
 2014-04-13 17:04:00 -07:00
Stanislav Malyshev
df8e34bcc1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix windows build
 2014-04-13 17:03:28 -07:00
Stanislav Malyshev
3a2660b302 Fix windows build 2014-04-13 17:02:21 -07:00
Stanislav Malyshev
11bdb85d30 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66721
 2014-04-13 15:56:02 -07:00
Stanislav Malyshev
d3c4292db7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66721
 2014-04-13 15:55:45 -07:00
Stanislav Malyshev
733b09442d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66721
 2014-04-13 15:55:07 -07:00
Boro Sitnikovski
8c88b6e81c Fix bug #66721 
Add NULL check to php_date_parse_tzfile's retval
 2014-04-13 15:51:55 -07:00
Stanislav Malyshev
9fb92eed83 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix apr_psprintf format string from e0df4e3dba
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
 2014-04-13 15:40:21 -07:00
Stanislav Malyshev
1be29a404a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba
 2014-04-13 15:39:32 -07:00
Stanislav Malyshev
c5275b4a92 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba
 2014-04-13 15:37:55 -07:00
Jeff Trawick
442264ffd6 fix apr_psprintf format string from e0df4e3dba 2014-04-13 15:36:43 -07:00
Stanislav Malyshev
3aab84c100 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
 2014-04-13 15:25:58 -07:00
Stanislav Malyshev
fe72caa6e5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
 2014-04-13 15:23:32 -07:00
Gabor Buella
1010200da5 Fixed bug #67024 - getimagesize should recognize BMP files with negative height 2014-04-13 15:17:04 -07:00
Bob Weinand
12844292b8 Merge branch 'PHP-5.6' 2014-04-14 00:10:25 +02:00
Bob Weinand
a93e734f81 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-14 00:08:36 +02:00
Daniel Lowrey
f1aa39c1af Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #66840: Fix broken build when extension built separately
 2014-04-13 15:19:23 -06:00
Daniel Lowrey
0e023e9784 Bug #66840: Fix broken build when extension built separately 2014-04-13 15:17:50 -06:00
Bob Weinand
bf3edbada6 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 23:03:53 +02:00
Bob Weinand
beda5093b4 Reverted to 5a0da281e5 
Discussion: http://news.php.net/php.cvs/76836
 2014-04-13 23:01:31 +02:00
Bob Weinand
e8728b4999 Merge branch 'PHP-5.6' 2014-04-13 19:41:27 +02:00
Bob Weinand
3636a91adc Merge branch 'PHP-5.5' into PHP-5.6 2014-04-13 19:40:39 +02:00
Bob Weinand
191d9fc227 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 19:37:06 +02:00
Bob Weinand
f07e37c96d Forgot title in phpt for bug #67064 2014-04-13 19:34:17 +02:00
Bob Weinand
2f3056fecc Updated NEWS 2014-04-13 19:32:51 +02:00
Bob Weinand
ef214aa3c0 Merge branch 'PHP-5.6' 2014-04-13 19:28:32 +02:00
Bob Weinand
fb99409f89 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-13 19:27:43 +02:00
Bob Weinand
eca0644e0a Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 19:25:07 +02:00
Bob Weinand
1a4a9eede5 Fix bug #67064 in a BC safe way 
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().
 2014-04-13 19:24:12 +02:00
Bob Weinand
d86c297659 Merge branch 'PHP-5.6' 2014-04-13 11:42:30 +02:00
Bob Weinand
a3eafe535f Added UPGRAING notice for bug #66015 in BC break section 2014-04-13 11:38:52 +02:00
Nikita Popov
099c070f18 Merge branch 'PHP-5.6' 2014-04-13 10:49:38 +02:00
Nikita Popov
fb5d5d9700 Add new zend_hash_* APIs to UPGRADING.INTERNALS 2014-04-13 10:49:14 +02:00
Nikita Popov
57b88ba6ea Add str_* macros to UPGRADING.INTERNALS 2014-04-13 10:49:14 +02:00
Ferenc Kovacs
c459805cb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66660: use str_efree instead of efree to handle interned empty strings correctly
 2014-04-13 10:48:42 +02:00
Ferenc Kovacs
20036525e2 Fix bug #66660: use str_efree instead of efree to handle interned empty strings correctly 2014-04-13 10:45:46 +02:00