clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,080 Commits 494 Branches 1,367 Tags 801 MiB
8785e22bca
Commit Graph

78080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
8785e22bca Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
 2013-12-28 14:26:24 +01:00
Remi Collet
46809869a3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
 2013-12-28 14:26:06 +01:00
Remi Collet
8f4a5373bb Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) 
Initial fix was PHP stuff
This one is libgd fix.

- filter invalid crop size
- dont try to copy on invalid position
- fix crop size when out of src image
- fix possible NULL deref
- fix possible integer overfloow
 2013-12-28 14:22:13 +01:00
krakjoe
50f09d8256 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update version output
 2013-12-27 18:04:06 +00:00
krakjoe
c8dedaf2dc update version output 2013-12-27 18:03:11 +00:00
Xinchen Hui
fb4678f1ac Merge branch 'PHP-5.6' 2013-12-27 20:46:08 +08:00
Xinchen Hui
a8cd9b417c Fixed bug #66358 (fpm starts segfault) 2013-12-27 20:45:43 +08:00
Xinchen Hui
c0476ff44b Merge branch 'PHP-5.6' 2013-12-27 14:11:41 +08:00
Xinchen Hui
6908dc3e97 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	main/php_version.h
 2013-12-27 14:11:35 +08:00
Xinchen Hui
aba76f09fa Revert accidented committed php_version.h 2013-12-27 14:10:55 +08:00
Xinchen Hui
1a4863d560 Merge branch 'PHP-5.6' 2013-12-27 14:07:15 +08:00
Xinchen Hui
04a52443e7 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	main/php_version.h
 2013-12-27 14:06:35 +08:00
Xinchen Hui
2938329ce1 Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) 
And also fixed the bug: arguments are altered after some calls
 2013-12-27 14:04:59 +08:00
Dmitry Stogov
65fd18fd88 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).

Conflicts:
	NEWS
	Zend/zend_extensions.h
	Zend/zend_modules.h
 2013-12-26 14:51:05 +04:00
Dmitry Stogov
03a37de9b3 Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings). 2013-12-26 14:47:13 +04:00
Xinchen Hui
d6713f3989 Fixed warning "No new line at end of file" 2013-12-26 17:45:37 +08:00
Dmitry Stogov
ef56cfb991 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero
 2013-12-26 11:53:03 +04:00
Dmitry Stogov
0ff0e82f26 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

Conflicts:
	NEWS
 2013-12-26 11:52:39 +04:00
Dmitry Stogov
6414fe283e Fixed ZEND_MM_MEM_TYPE=mmap_zero 2013-12-26 11:51:32 +04:00
Anatol Belski
c676f5b36d Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix c89 compat
 2013-12-25 23:44:24 +01:00
Anatol Belski
1e411ebdf5 fix c89 compat 2013-12-25 23:43:20 +01:00
Anatol Belski
734c28d242 Merge branch 'PHP-5.6' 
* PHP-5.6:
  brought the ext/sybase_ct/config.w32 up to date
 2013-12-25 23:31:17 +01:00
Anatol Belski
9f9179cc62 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  brought the ext/sybase_ct/config.w32 up to date
 2013-12-25 23:30:59 +01:00
Anatol Belski
5b0620831c brought the ext/sybase_ct/config.w32 up to date 2013-12-25 23:29:42 +01:00
Xinchen Hui
43cfa7f12a Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2013-12-25 15:36:55 +08:00
Xinchen Hui
bd0a8f31a4 Merge branch 'master' of git.php.net:php-src 2013-12-25 15:36:45 +08:00
Xinchen Hui
03e36cd5b8 Merge branch 'PHP-5.6' 2013-12-25 15:35:02 +08:00
Xinchen Hui
d316040857 Fix test 2013-12-25 15:34:39 +08:00
Stanislav Malyshev
b3c43a1aec Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.4.25 next
 2013-12-24 22:23:55 -08:00
Stanislav Malyshev
c6df27db0f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.25 next
 2013-12-24 22:23:42 -08:00
Stanislav Malyshev
a2503c6af3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.25 next

Conflicts:
	configure.in
	main/php_version.h
 2013-12-24 22:23:24 -08:00
Stanislav Malyshev
8e5048f9fb 5.4.25 next 2013-12-24 22:22:04 -08:00
Anatol Belski
3af0ee0ea3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed incompatible pointer in phpdbg on win64
 2013-12-24 21:09:45 +01:00
Anatol Belski
00c7b973bb fixed incompatible pointer in phpdbg on win64 2013-12-24 21:08:33 +01:00
Bob Weinand
c02acf3c29 Merge branch 'PHP-5.6' 2013-12-24 13:20:12 +01:00
Bob Weinand
ddf733fa69 Fixed #18 
Errors not displaying in some configurations
 2013-12-24 13:19:18 +01:00
Bob Weinand
2b98abd9a8 Merge branch 'master' of sapi/phpdbg into PHP-5.6 
merge is necessary,
 2013-12-24 13:18:18 +01:00
Bob Weinand
8064d8dfd6 Fixed #18 
Errors not displaying in some configurations
 2013-12-24 13:11:57 +01:00
Joe Watkins
ca8ff0725b update credits 2013-12-24 09:04:32 +00:00
Joe Watkins
e07dfa96b3 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  fix NEWS file for master
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file
 2013-12-24 09:03:55 +00:00
Joe Watkins
e538c1ad3f update credits headers 2013-12-24 09:03:22 +00:00
Joe Watkins
7b17d6c4bf Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 
* 'PHP-5.6' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file
 2013-12-24 09:02:52 +00:00
Bob Weinand
ad358593a8 Merge branch 'PHP-5.6' 2013-12-24 00:37:20 +01:00
Bob Weinand
ca882858f4 Fixed credits in phpdbg.* files 2013-12-24 00:34:23 +01:00
Bob Weinand
ebfe304d6a Merge branch 'master' of sapi/phpdbg into PHP-5.6 2013-12-24 00:33:25 +01:00
Bob Weinand
0577ccad28 Added breaking upon fatal-ish error 2013-12-24 00:30:37 +01:00
Stanislav Malyshev
6daa84f199 fix NEWS file for master 2013-12-23 15:25:38 -08:00
Joe Watkins
617aefbcda credits file for phpdbg 2013-12-24 00:16:47 +01:00
Bob Weinand
6f63609251 Fixed credits in phpdbg.* files 2013-12-23 23:55:07 +01:00
Joe Watkins
056f6fd895 Merge branch 'PHP-5.6' 
* PHP-5.6:
  credits file for phpdbg
 2013-12-23 22:37:36 +00:00