php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity
79,469 Commits 549 Branches 1,485 Tags
fca588996311eb59f52ea4beddedcdfff050f0e1
Commit Graph

79469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski fca5889963 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67033 Remove reference to Windows 95
 2014-04-14 09:34:02 +02:00
Anatol Belski e3abcf7826 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #67033 Remove reference to Windows 95
 2014-04-14 09:33:49 +02:00
Anatol Belski 57d657987d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67033 Remove reference to Windows 95
 2014-04-14 09:33:31 +02:00
Anatol Belski 95c57bb646 Fixed bug #67033 Remove reference to Windows 95 2014-04-14 09:32:31 +02:00
Stanislav Malyshev 1155b62ba4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix NEWS
 2014-04-13 20:17:30 -07:00
Stanislav Malyshev cfe24a7be2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix NEWS
 2014-04-13 20:17:14 -07:00
Stanislav Malyshev 6e81f80a1e MErge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix NEWS
 2014-04-13 20:16:54 -07:00
Stanislav Malyshev b80243aece fix NEWS 2014-04-13 20:16:27 -07:00
Stanislav Malyshev 3970b9d7dd Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:56:26 -07:00
Stanislav Malyshev 7c9209a0d1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:56:16 -07:00
Stanislav Malyshev 9bba219c75 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:55:28 -07:00
Stanislav Malyshev 5e66ce9293 Merge branch 'pull-request/518' into PHP-5.4 
* pull-request/518:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:50:39 -07:00
Stanislav Malyshev 9f9f378c88 Merge branch 'pull-request/533' 
* pull-request/533:
  Fixed bug 64604
 2014-04-13 18:39:58 -07:00
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