42f084c692
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
[libxml] Unit test for libxml_disable_entity_loader()
2014-01-06 17:05:16 +00:00
24cc7c0be2
[libxml] Unit test for libxml_disable_entity_loader()
...
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
2014-01-06 17:04:54 +00:00
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
1c586d4070
one more extension for the basename test
2014-01-05 19:19:54 +01:00
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
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
aaec199050
updated NEWS
2014-01-04 01:41:02 +01:00
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
d992a972c0
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-04 01:24:54 +01:00
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
8a5ac85fa6
updated NEWS
2014-01-03 22:42:38 +01:00
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
46f60fae22
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:25:58 +01:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
e7b62fe5a6
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-03 11:06:12 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
405f6417f1
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-02 12:52:08 +00:00
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
dee77f237c
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2014-01-02 10:57:46 +00:00
9eb7997852
- BFN
2014-01-01 22:33:12 -02:00
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
3c3ff43432
fix #66375 bad logic in sapi header callback routine
2014-01-01 12:58:18 +00:00
49cdde7326
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2014-01-01 09:56:31 -02:00
5967fb194f
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:55:14 -02:00
c7ee97eea0
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-30 13:54:58 +01:00
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
ed5be4f7ad
Fix test fail
2013-12-30 11:07:25 +08:00
6699b1f8ea
Fix dos style eol in phpts
2013-12-30 10:58:01 +08:00
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
464c219ed4
minor fix on previous
2013-12-28 14:29:14 +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
aba76f09fa
Revert accidented committed php_version.h
2013-12-27 14:10:55 +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
6414fe283e
Fixed ZEND_MM_MEM_TYPE=mmap_zero
2013-12-26 11:51:32 +04:00
5b0620831c
brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:29:42 +01: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
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
f7b6db7555
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:09:45 +04:00
0dcaf0f445
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
2013-12-23 12:46:30 +04:00
704866d6fd
opcodes
2013-12-22 13:20:41 +00:00
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
b1df00a7c9
stop warnings from unused opcode map
2013-12-22 13:00:51 +00:00
c14388d63f
- BFN
2013-12-22 09:43:53 -02:00
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
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
7e3af096b3
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_opcodes.c
2013-12-22 00:54:59 +01:00
97bf254385
Included new .c file in build too
2013-12-22 00:52:05 +01:00
00cc4dccb8
Fixed little typo in zend_vm_gen.php
2013-12-21 23:52:48 +01:00
Scott MacVicar