clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,973 Commits 494 Branches 1,367 Tags 786 MiB
3e176e0166
Commit Graph

80973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
3e176e0166 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
 2014-08-04 10:51:19 +02:00
Remi Collet
3bb5682ed1 NEWS 2014-08-04 10:50:56 +02:00
Remi Collet
6dcc3f9840 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
 2014-08-04 10:50:33 +02:00
Remi Collet
1158563958 NEWS 2014-08-04 10:48:29 +02:00
Remi Collet
a45b8874fb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
 2014-08-04 10:47:54 +02:00
Remi Collet
d3b5ed0787 NEWS 2014-08-04 10:46:53 +02:00
Remi Collet
cf4753691d Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference 
Upstream 463c3bd09b

Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image
 2014-08-04 10:42:39 +02:00
Anatol Belski
eee03852b6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  backport the fix for bug #67739
 2014-08-04 09:59:06 +02:00
Anatol Belski
d730675be5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  backport the fix for bug #67739
 2014-08-04 09:58:47 +02:00
Anatol Belski
e0c1fa30c4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  backport the fix for bug #67739
 2014-08-04 09:57:59 +02:00
Anatol Belski
ae74549239 backport the fix for bug #67739 2014-08-04 09:57:08 +02:00
Anatol Belski
8eeacd3364 Merge branch 'pull-request/756' 2014-08-04 09:47:11 +02:00
Stanislav Malyshev
fa42a513a4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67705 (extensive backtracking in rule regular expression)
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)
 2014-08-04 00:15:38 -07:00
Stanislav Malyshev
12d76b8cce Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)

Conflicts:
	ext/fileinfo/data_file.c
	ext/fileinfo/libmagic/softmagic.c
	ext/fileinfo/magicdata.patch
 2014-08-04 00:12:43 -07:00
Stanislav Malyshev
28786a2f82 Fix bug #67705 (extensive backtracking in rule regular expression) 2014-08-04 00:09:15 -07:00
Stanislav Malyshev
9b9aa4b811 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add test
 2014-08-04 00:08:17 -07:00
Stanislav Malyshev
61ec9b5b0f add test 2014-08-04 00:08:08 -07:00
Stanislav Malyshev
c9e114a451 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67705 (extensive backtracking in rule regular expression)
 2014-08-04 00:06:22 -07:00
Stanislav Malyshev
eeaec70758 Fix bug #67705 (extensive backtracking in rule regular expression) 2014-08-04 00:05:40 -07:00
Christian Wenz
513d48f2ef Patches #67739 
Fixes #67739: Windows 8.1/Server 2012 R2 OS build number reported as 6.2 (instead of 6.3)
 2014-08-01 22:38:18 +02:00
Andrea Faulds
fe894c2154 PHP_INT_MIN and _MAX tests 2014-08-01 17:01:17 +01:00
Andrea Faulds
a2bbc6f985 Merge branch 'PHP_INT_MIN' 2014-08-01 16:29:34 +01:00
Andrea Faulds
d6cf8be094 NEWS and UPGRADING 2014-08-01 16:28:20 +01:00
Andrea Faulds
24d7fc2bbc Added PHP_INT_MIN 2014-08-01 14:29:50 +01:00
Andrey Hristov
1d609d2d26 Merge branch 'PHP-5.6' 2014-07-31 21:28:19 +03:00
Andrey Hristov
f5deb18b20 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-31 21:28:09 +03:00
Andrey Hristov
95febf26c6 Fix wrong lenght size 2014-07-31 21:27:51 +03:00
Peter Cowburn
d5542c4a17 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #51096 - Remove unnecessary ? for first/last day of
 2014-07-31 14:35:13 +01:00
Peter Cowburn
6a4f0b14eb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #51096 - Remove unnecessary ? for first/last day of
 2014-07-31 14:34:50 +01:00
Peter Cowburn
c2f2d5c8fc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #51096 - Remove unnecessary ? for first/last day of

Conflicts:
	ext/date/lib/parse_date.c
 2014-07-31 14:33:55 +01:00
Peter Cowburn
bff84d7c18 Merge branch 'pull-request/754' into PHP-5.4 2014-07-31 14:30:39 +01:00
Peter Cowburn
358aedc454 Bug #51096 - Remove unnecessary ? for first/last day of 2014-07-31 14:21:38 +01:00
Tjerk Meesters
a41a16c5cd Merge branch 'PHP-5.6' 
* PHP-5.6:
  Moved streams related functions to xp_ssl.c
 2014-07-31 12:18:19 +08:00
Tjerk Meesters
8f345a7148 Moved streams related functions to xp_ssl.c 2014-07-31 12:17:17 +08:00
Keyur Govande
33ce329f57 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
 2014-07-30 18:50:07 +00:00
Keyur Govande
4383ac04a0 Remove duplicate NEWS 2014-07-30 18:48:43 +00:00
Keyur Govande
33c4b9d5a6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Update NEWS
 2014-07-30 18:41:13 +00:00
Keyur Govande
b96224625c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
 2014-07-30 18:39:59 +00:00
Keyur Govande
7b60430a8f Update NEWS 2014-07-30 18:39:23 +00:00
Keyur Govande
752c40d2ec Update NEWS 2014-07-30 18:38:48 +00:00
Keyur Govande
0a29e4731e Update NEWS 2014-07-30 18:33:19 +00:00
Michael Wallner
03f56152e5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
 2014-07-30 20:14:40 +02:00
Michael Wallner
b3b25e1b70 BFN 2014-07-30 20:14:03 +02:00
Michael Wallner
ceadf783fe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
 2014-07-30 20:13:39 +02:00
Michael Wallner
48cadf242d BFN 2014-07-30 20:13:17 +02:00
Michael Wallner
6ed9991a6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67715 (php-milter does not build and crashes randomly).
 2014-07-30 20:12:50 +02:00
Michael Wallner
12b2127b72 Fixed bug #67715 (php-milter does not build and crashes randomly). 2014-07-30 20:12:13 +02:00
Rasmus Lerdorf
e7d921fd0b Merge commit '8b9719d' 
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
 2014-07-30 12:23:46 -04:00
Rasmus Lerdorf
7fe21ce0f3 Merge commit '8b9719d' into PHP-5.6 
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
 2014-07-30 12:23:36 -04:00
Rasmus Lerdorf
579c9066a0 Merge commit '8b9719d' into PHP-5.5 
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
 2014-07-30 12:23:24 -04:00