clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 12:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,114 Commits 494 Branches 1,367 Tags 781 MiB
d3a053d9f4
Commit Graph

75114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
d3a053d9f4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:32:39 +01:00
Anatol Belski
46f60fae22 Fixed bug #66395 basename function doesn't remove drive letter 2014-01-03 22:25:58 +01:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
e7b62fe5a6 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-03 11:06:12 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Derick Rethans
405f6417f1 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-02 12:52:08 +00:00
Derick Rethans
5137cb5f0c Fixed (some of) add/sub. 
This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
 2014-01-02 12:45:48 +00:00
Derick Rethans
dee77f237c Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2014-01-02 10:57:46 +00:00
Felipe Pena
9eb7997852 - BFN 2014-01-01 22:33:12 -02:00
krakjoe
e9195018dc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix #66375 bad logic in sapi header callback routine
 2014-01-01 13:00:29 +00:00
krakjoe
3c3ff43432 fix #66375 bad logic in sapi header callback routine 2014-01-01 12:58:18 +00:00
Felipe Pena
49cdde7326 Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 2014-01-01 09:56:31 -02:00
Felipe Pena
5967fb194f - Fixed bug #66381 (__ss_family was changed on AIX 5.3) 2014-01-01 09:55:14 -02:00
Nikita Popov
c7ee97eea0 Merge branch 'PHP-5.4' into PHP-5.5 2013-12-30 13:54:58 +01:00
Nikita Popov
3b6afb1bd6 Fix leak caused by fix to bug #65667 
ftp->stream is now closed in the ftp resource dtor.
 2013-12-30 13:53:12 +01:00
Xinchen Hui
ed5be4f7ad Fix test fail 2013-12-30 11:07:25 +08:00
Xinchen Hui
6699b1f8ea Fix dos style eol in phpts 2013-12-30 10:58:01 +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
464c219ed4 minor fix on previous 2013-12-28 14:29:14 +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
Xinchen Hui
aba76f09fa Revert accidented committed php_version.h 2013-12-27 14:10:55 +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
6414fe283e Fixed ZEND_MM_MEM_TYPE=mmap_zero 2013-12-26 11:51:32 +04:00
Anatol Belski
5b0620831c brought the ext/sybase_ct/config.w32 up to date 2013-12-25 23:29:42 +01: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
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
f7b6db7555 Added suggestion about opcache.revalidate_freq setting in development environment 2013-12-23 13:09:45 +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
krakjoe
704866d6fd opcodes 2013-12-22 13:20:41 +00:00
krakjoe
247ec0d81f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  stop warnings from unused opcode map
  - BFN
 2013-12-22 13:07:41 +00:00
krakjoe
b1df00a7c9 stop warnings from unused opcode map 2013-12-22 13:00:51 +00:00
Felipe Pena
c14388d63f - BFN 2013-12-22 09:43:53 -02:00
Felipe Pena
8e36d36ee6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
 2013-12-22 09:42:58 -02:00
Felipe Pena
a056113586 - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com 2013-12-22 09:42:45 -02:00
Bob Weinand
7e3af096b3 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_opcodes.c
 2013-12-22 00:54:59 +01:00
Bob Weinand
97bf254385 Included new .c file in build too 2013-12-22 00:52:05 +01:00
Bob Weinand
00cc4dccb8 Fixed little typo in zend_vm_gen.php 2013-12-21 23:52:48 +01:00
Bob Weinand
0dd2765687 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_opcodes.h
 2013-12-21 23:49:28 +01:00
Bob Weinand
61199be02f Moved to new file, killing a lot of warnings 2013-12-21 23:45:34 +01:00
Bob Weinand
560f90e511 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_gen.php
	Zend/zend_vm_opcodes.h
 2013-12-21 21:31:48 +01:00
Bob Weinand
7894e397d8 Fixed build... 2013-12-21 21:29:08 +01:00
Bob Weinand
b52c300eca Merge branch 'PHP-5.4' into PHP-5.5 2013-12-21 19:27:58 +01:00
Bob Weinand
50d50c2f04 Added an opcode to opcode name map 
That way extensions etc. don't have to maintain their own lists anymore.
Also as phpdbg is included and needs such a map, it'd be counterproductive to need to change two things on every new opcode.
 2013-12-21 19:22:47 +01:00
Boris Lytochkin
e195faa18f Merge branch '5.5' into PHP-5.5 
* 5.5:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
 2013-12-20 01:01:41 +04:00
Boris Lytochkin
a6fa52028f Merge branch '5.4' into PHP-5.4 
* 5.4:
  keep 'em sorted
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
 2013-12-20 01:00:46 +04:00
Boris Lytochkin
a7c50ccc67 keep 'em sorted 2013-12-20 00:51:59 +04:00
Boris Lytochkin
324eb07440 Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin) 2013-12-20 00:37:29 +04:00
Boris Lytochkin
b65bd30e89 Merge branch '5.4' into 5.5 
* 5.4:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
 2013-12-20 00:26:34 +04:00