mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-13 03:44:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
75,236 Commits 503 Branches 1,384 Tags 807 MiB
23cb7bd506
Commit Graph

75236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
7359dd6df3 Log information about cached scripts and keys 2014-01-15 12:12:22 +04:00
Yasuo Ohgaki
f52c251f60 Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1 2014-01-15 11:06:06 +09:00
Dmitry Stogov
9c32d30020 Fixed ZTS build 2014-01-13 23:09:59 +04:00
Anatol Belski
8092de3ca3 forked test for win32 2014-01-13 17:12:14 +01:00
Dmitry Stogov
ce2f024e9f Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0) 2014-01-13 18:05:21 +04:00
Dmitry Stogov
fcd75690fe Fixed bug #66474 (Optimizer bug in constant string to boolean conversion) 2014-01-13 12:06:19 +04:00
Johannes Schlüter
98e06a10d3 fix encoding 2014-01-10 15:57:40 +01:00
Julien Pauli
277895717c 5.5.9-dev now 2014-01-10 10:01:30 +01:00
Anatol Belski
4f115c0b7d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed EOL in the test
 2014-01-09 15:28:09 +01:00
Anatol Belski
b8774519e2 fixed EOL in the test 2014-01-09 15:27:26 +01:00
Anatol Belski
418602adfb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added testcase from bug #65371
 2014-01-09 15:24:31 +01:00
Anatol Belski
e927dbd1f6 added testcase from bug #65371 2014-01-09 15:23:49 +01:00
Dmitry Stogov
b5fbde9c5b Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry) 2014-01-09 13:48:08 +04:00
Anatol Belski
748e707bf9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  one more extension for the basename test
 2014-01-05 19:21:27 +01:00
Anatol Belski
1c586d4070 one more extension for the basename test 2014-01-05 19:19:54 +01:00
Anatol Belski
3bde9cfd8d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  improved the fix for bug #66395
 2014-01-05 19:12:52 +01:00
Anatol Belski
3f7f72adb2 improved the fix for bug #66395 
- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
 2014-01-05 19:05:04 +01:00
Anatol Belski
aaec199050 updated NEWS 2014-01-04 01:41:02 +01:00
Anatol Belski
ae1cc83f98 Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012 
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
 2014-01-04 01:41:01 +01:00
Nikita Popov
d992a972c0 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-04 01:24:54 +01:00
Nikita Popov
7e8e21df0c Fix bug #66286: Incorrect object comparison with inheritance 
std_compare_objects immidiately returned 0 if the property tables
of both objects contain NULL at some index. Thus it would report
objects as equal even though properties following after that
differ.
 2014-01-04 01:22:14 +01:00
Anatol Belski
8a5ac85fa6 updated NEWS 2014-01-03 22:42:38 +01:00
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