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
77,882 Commits 494 Branches 1,367 Tags 800 MiB
a88543a106
Commit Graph

77882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
a88543a106 Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 2013-12-30 10:51:47 +08:00
Xinchen Hui
a8548d9765 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 10:51:36 +08:00
Xinchen Hui
04c8ce259f Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 
Use git blame -w to ingore the space changes
 2013-12-30 10:50:46 +08:00
Remi Collet
809eb77689 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  minor fix on previous
 2013-12-28 14:29:27 +01:00
Remi Collet
464c219ed4 minor fix on previous 2013-12-28 14:29:14 +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
c8dedaf2dc update version output 2013-12-27 18:03:11 +00:00
Xinchen Hui
a8cd9b417c Fixed bug #66358 (fpm starts segfault) 2013-12-27 20:45:43 +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
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
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
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
1e411ebdf5 fix c89 compat 2013-12-25 23:43:20 +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
d316040857 Fix test 2013-12-25 15:34:39 +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
00c7b973bb fixed incompatible pointer in phpdbg on win64 2013-12-24 21:08:33 +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
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
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
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
265fdd9139 credits file for phpdbg 2013-12-23 22:36:30 +00:00
Stanislav Malyshev
571ac34393 restore NEWS to the state of 6c5e93fe17 2013-12-23 14:10:08 -08:00
krakjoe
7b215b36bc reformat 2013-12-23 21:54:45 +00:00
krakjoe
2d82e994b6 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-12-23 21:52:32 +00:00
krakjoe
d82e7ee7f8 credits file 2013-12-23 21:52:22 +00:00
Dmitry Stogov
a00e7f22d2 Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable) 2013-12-23 16:53:34 +04:00
Dmitry Stogov
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
Dmitry Stogov
ccb29a6e41 Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry) 2013-12-23 16:04:10 +04:00
Anatol Belski
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
Anatol Belski
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
Anatol Belski
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
Dmitry Stogov
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
Dmitry Stogov
f7b6db7555 Added suggestion about opcache.revalidate_freq setting in development environment 2013-12-23 13:09:45 +04:00
Dmitry Stogov
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
Dmitry Stogov
0dcaf0f445 Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq" 2013-12-23 12:46:30 +04:00