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
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
c8dedaf2dc
update version output
2013-12-27 18:03:11 +00:00
a8cd9b417c
Fixed bug #66358 (fpm starts segfault)
2013-12-27 20:45:43 +08:00
6908dc3e97
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/php_version.h
2013-12-27 14:11:35 +08:00
aba76f09fa
Revert accidented committed php_version.h
2013-12-27 14:10:55 +08:00
04a52443e7
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/php_version.h
2013-12-27 14:06:35 +08:00
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
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
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
6414fe283e
Fixed ZEND_MM_MEM_TYPE=mmap_zero
2013-12-26 11:51:32 +04:00
1e411ebdf5
fix c89 compat
2013-12-25 23:43:20 +01:00
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
5b0620831c
brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:29:42 +01:00
43cfa7f12a
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2013-12-25 15:36:55 +08:00
d316040857
Fix test
2013-12-25 15:34:39 +08:00
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
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
8e5048f9fb
5.4.25 next
2013-12-24 22:22:04 -08:00
00c7b973bb
fixed incompatible pointer in phpdbg on win64
2013-12-24 21:08:33 +01:00
ddf733fa69
Fixed #18
...
Errors not displaying in some configurations
2013-12-24 13:19:18 +01:00
2b98abd9a8
Merge branch 'master' of sapi/phpdbg into PHP-5.6
...
merge is necessary,
2013-12-24 13:18:18 +01:00
8064d8dfd6
Fixed #18
...
Errors not displaying in some configurations
2013-12-24 13:11:57 +01:00
e538c1ad3f
update credits headers
2013-12-24 09:03:22 +00:00
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
ca882858f4
Fixed credits in phpdbg.* files
2013-12-24 00:34:23 +01:00
ebfe304d6a
Merge branch 'master' of sapi/phpdbg into PHP-5.6
2013-12-24 00:33:25 +01:00
0577ccad28
Added breaking upon fatal-ish error
2013-12-24 00:30:37 +01:00
617aefbcda
credits file for phpdbg
2013-12-24 00:16:47 +01:00
6f63609251
Fixed credits in phpdbg.* files
2013-12-23 23:55:07 +01:00
265fdd9139
credits file for phpdbg
2013-12-23 22:36:30 +00:00
571ac34393
restore NEWS to the state of 6c5e93fe17
2013-12-23 14:10:08 -08:00
7b215b36bc
reformat
2013-12-23 21:54:45 +00:00
2d82e994b6
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-12-23 21:52:32 +00:00
d82e7ee7f8
credits file
2013-12-23 21:52:22 +00:00
a00e7f22d2
Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
2013-12-23 16:53:34 +04:00
fff72bc93b
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
removed outdated IsDebuggerPresent declaration
2013-12-23 16:05:59 +04:00
ccb29a6e41
Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
2013-12-23 16:04:10 +04:00
19039984e2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:01:10 +01:00
3f7a145b5a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:00:49 +01:00
f156e684ac
removed outdated IsDebuggerPresent declaration
...
This piece of code seems to retain compatibility with some windows
versions before 2000. Today it's not relevant anymore and only
produces a warning C4273 because of the conflicting prototype. In
VC9 the declaration is present in winbase.h:4142, but available
is it already in winxp. Here's the doc link
http://msdn.microsoft.com/en-us/library/windows/desktop/ms680345(v=vs.85).aspx
2013-12-23 11:53:47 +01:00
8650d2dda6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:10:42 +04:00
f7b6db7555
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:09:45 +04:00
f5c200fce9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
opcodes
2013-12-23 12:50:42 +04:00
0dcaf0f445
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
2013-12-23 12:46:30 +04:00
ee55edf5e4
fix news
2013-12-22 13:30:41 +00:00
704866d6fd
opcodes
2013-12-22 13:20:41 +00:00
d455377fad
opcodes
2013-12-22 13:20:17 +00:00
df9f2ad2e9
Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
2013-12-22 13:17:21 +00:00
2a1b60569f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
stop warnings from unused opcode map
- BFN
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
Included new .c file in build too
Fixed little typo in zend_vm_gen.php
Moved to new file, killing a lot of warnings
2013-12-22 13:11:20 +00:00
Remi Collet