clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,139 Commits 494 Branches 1,367 Tags 800 MiB
e8e907279e
Commit Graph

80139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derick Rethans
7ee66c51e6 Merge branch 'PHP-5.6' 2014-05-13 16:37:07 +01:00
Derick Rethans
db42f83c2e Merge branch 'PHP-5.5' into PHP-5.6 2014-05-13 16:37:05 +01:00
Derick Rethans
e3a48b3a43 Merge branch 'PHP-5.4' into PHP-5.5 2014-05-13 16:36:59 +01:00
Derick Rethans
3e276d6728 - Updated to version 2014.3 (2014c) 2014-05-13 16:36:58 +01:00
Stanislav Malyshev
c7abe84d94 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test - output can be chunked
  fix test

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
 2014-05-12 10:58:18 -07:00
Stanislav Malyshev
2152e2f127 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test - output can be chunked

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
 2014-05-12 10:56:03 -07:00
Stanislav Malyshev
e3ca87265d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test - output can be chunked
 2014-05-12 10:54:34 -07:00
Stanislav Malyshev
6ef8e0f088 fix test - output can be chunked 2014-05-12 10:54:16 -07:00
Stanislav Malyshev
db35409136 fix test 2014-05-12 01:40:39 -07:00
Stanislav Malyshev
9c27063a65 fix test 2014-05-12 01:27:18 -07:00
Yasuo Ohgaki
072bbe95ea Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed test for commit 997be125eb
 2014-05-12 15:38:40 +09:00
Yasuo Ohgaki
00cacc6048 Fixed test for commit 997be125eb 2014-05-12 15:35:16 +09:00
Yasuo Ohgaki
eb1278cb5d Add bug fix to NEWS 2014-05-12 15:35:16 +09:00
Yasuo Ohgaki
2f9766fd02 Update UPGRADING according to bug fix 2014-05-12 15:35:16 +09:00
Stanislav Malyshev
8a22540a95 Fix bug #67060: use default mode of 660 2014-05-11 23:32:35 -07:00
Stanislav Malyshev
97b203c93f fix test 2014-05-11 23:20:33 -07:00
Stanislav Malyshev
41b655d9cd improve CURL tests to allow testing without separate server 2014-05-11 23:04:09 -07:00
Stanislav Malyshev
89798f57d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  improve CURL tests to allow testing without separate server
 2014-05-11 23:03:21 -07:00
Stanislav Malyshev
c507c9f01b improve CURL tests to allow testing without separate server 2014-05-11 22:43:08 -07:00
Yasuo Ohgaki
a33a817f0e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67199	mb_regex_encoding mishmash
 2014-05-12 13:34:43 +09:00
Yasuo Ohgaki
997be125eb Fixed bug #67199 mb_regex_encoding mishmash 2014-05-12 13:33:53 +09:00
Stanislav Malyshev
466b8aa444 fix bug #67253: timelib_meridian_with_check out-of-bounds read 2014-05-11 21:09:11 -07:00
Stanislav Malyshev
1e2818b143 Fix bug #67252: convert_uudecode out-of-bounds read 2014-05-11 20:29:27 -07:00
Stanislav Malyshev
0a80849250 Fix bug #67251 - date_parse_from_format out-of-bounds read 2014-05-11 19:34:21 -07:00
Stanislav Malyshev
3e9cb6a4a5 Fix bug #67250 (iptcparse out-of-bounds read) 2014-05-11 19:09:19 -07:00
Stanislav Malyshev
eaa39c9388 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
 2014-05-11 18:57:39 -07:00
Stanislav Malyshev
f2fdeba19d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
 2014-05-11 18:56:32 -07:00
Stanislav Malyshev
af5cc61cf3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
 2014-05-11 18:16:19 -07:00
Stanislav Malyshev
291b45afb5 Fix bug #67248 (imageaffinematrixget missing check of parameters) 2014-05-11 18:14:57 -07:00
Stanislav Malyshev
2b475eebbe Fix bug #67247 spl_fixedarray_resize integer overflow 2014-05-11 17:54:27 -07:00
Stanislav Malyshev
14dd6c2d54 fix news 2014-05-11 17:43:28 -07:00
Stanislav Malyshev
cdd1c1122e add tests stuff to README 2014-05-11 16:04:28 -07:00
Bob Weinand
5bc4eb714a Merge branch 'PHP-5.4' into PHP-5.5 2014-05-11 15:15:27 +02:00
Bob Weinand
62b2eb666d Updated NEWS 2014-05-11 15:13:40 +02:00
Bob Weinand
5bf6a093ad Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) 
Linux apparently does not like memcpy in overlapping regions...
 2014-05-11 15:11:03 +02:00
Felipe Pena
2ed2283932 Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
 2014-05-11 09:46:47 -03:00
Felipe Pena
9d8a00337d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
 2014-05-11 09:46:38 -03:00
Felipe Pena
b99862e7ae Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
 2014-05-11 09:46:25 -03:00
Felipe Pena
fb3b8de98d - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org) 2014-05-11 09:45:17 -03:00
Felipe Pena
bd88e8dfd2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Move checking
 2014-05-10 11:55:51 -03:00
Felipe Pena
ece7421864 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Move checking
 2014-05-10 11:55:48 -03:00
Felipe Pena
16b293de50 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Move checking
 2014-05-10 11:55:45 -03:00
Felipe Pena
c575ab0c88 - Move checking 2014-05-10 11:55:42 -03:00
Felipe Pena
b09529ec1a Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
 2014-05-10 11:53:59 -03:00
Felipe Pena
c54b9f7b72 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
 2014-05-10 11:53:54 -03:00
Felipe Pena
8bea8cf9cd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
 2014-05-10 11:53:45 -03:00
Felipe Pena
345f6d90d5 - Fixed missing NULL check in SimpleXMLElement::xpath() 2014-05-10 11:53:40 -03:00
Felipe Pena
4308cf30ba Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed missing NULL check
 2014-05-10 11:40:04 -03:00
Felipe Pena
edbd6c7cc0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed missing NULL check
 2014-05-10 11:39:47 -03:00
Felipe Pena
2379ec474e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed missing NULL check
 2014-05-10 11:39:28 -03:00