archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
77348 commits 526 branches 1434 tags 873 MiB
Commit graph

133 commits

Author SHA1 Message Date
Stanislav Malyshev
4e2fb47092 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69646	OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

Conflicts:
	ext/dom/document.c
	ext/gd/gd.c
 2015-06-09 15:31:27 -07:00
Stanislav Malyshev
f7d7befae8 Fix #69719 - more checks for nulls in paths 2015-06-09 10:52:38 -07:00
Stanislav Malyshev
4782ceea80 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  fix non-standard C
 2015-04-14 00:49:23 -07:00
Stanislav Malyshev
9af582bbe0 fix non-standard C 2015-04-14 00:46:47 -07:00
Stanislav Malyshev
0cb9d75cb6 Merge branch 'PHP-5.4.40' into PHP-5.5.24 
* PHP-5.4.40:
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Fixed bug #68901 (use after free)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fix bug #66550 (SQLite prepared statement use-after-free)
  Better fix for #68601 for perf 81e9a993f2
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
 2015-04-11 16:56:12 -07:00
Stanislav Malyshev
4435b9142f Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) 2015-04-11 16:53:22 -07:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Anatol Belski
eb84d5d0a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
 2014-04-01 10:12:06 +02:00
Anatol Belski
3cb056f523 Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://" 2014-04-01 10:07:18 +02:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Michael Wallner
a48d82d238 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
 2013-12-06 10:33:10 +01:00
Michael Wallner
098d2a5d0f fix possibly uninitialized value 2013-12-06 10:27:33 +01:00
Michael Wallner
9c0a70c1de Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65196
 2013-12-02 17:01:25 +01:00
Michael Wallner
22fa3fbc5f Fix bug #65196 
Passing DOMDocumentFragment to DOMDocument::saveHTML()
produces invalid markup, because a DocumentFragment is just a container
for child nodes and not a real node itself.
 2013-12-02 17:00:13 +01:00
Chris Wright
c091819f40 Add schema default/fixed value support 
Added support for adding fixed/default values during XSD validation
and added/updated associated tests
 2013-04-12 09:50:14 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Ilia Alshanetsky
3726c5c67a Removal of deadcode identified by coverity 2011-08-08 13:45:18 +00:00
Ilia Alshanetsky
bfdd53cd04 Removal of deadcode identified by coverity 2011-08-08 13:45:18 +00:00
Stanislav Malyshev
83039b8fee fix params parsing 2011-08-01 04:29:37 +00:00
Stanislav Malyshev
5c42cde3cb fix params parsing 2011-08-01 04:29:37 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Christian Stocker
8806c371c8 Added the ability to pass options to loadHTML (Chregu, fxmulder at gmail dot com) 
(MFT - Merged from Trunk)
 2011-07-11 15:18:46 +00:00
Christian Stocker
0a7aeb7f28 Added the ability to pass options to loadHTML (Chregu, fxmulder at gmail dot com) 2011-07-11 15:02:56 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Felipe Pena
4737910b69 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Gustavo André dos Santos Lopes
b9b1fb1827 - Hopefully finally fixed the mess in rev 307562 and rev 307563. 2011-01-19 00:22:06 +00:00
Gustavo André dos Santos Lopes
f455f85e6c - Fixed wrong function call in original commit to FR #39771. 2011-01-18 19:56:09 +00:00
Gustavo André dos Santos Lopes
163b3bcec9 - Implemented FR #39771 (Made DOMDocument::saveHTML accept an optional 
DOMNode like DOMDocument::saveXML).
 2011-01-18 19:45:38 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Kalle Sommer Nielsen
68b1905702 Cast to char * here 2010-09-23 03:54:54 +00:00
Rob Richards
01d9389c2c fix bug #48983 (DomDocument : saveHTMLFile wrong charset) 2010-04-02 20:08:15 +00:00
Rob Richards
6feb1edcb6 re-apply bug fix #35673 (formatOutput does not work with saveHTML) from old trunk 
add test
BFN
 2010-04-02 16:15:06 +00:00
Rob Richards
bc1feb9034 fix bug #50661 (DOMDocument::loadXML does not allow UTF-16) 
add test
 2010-01-06 13:13:17 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Rob Richards
3fa1ea9731 fix bug #47848 (importNode doesn't preserve attribute namespaces) 
add tests
 2009-12-03 20:19:38 +00:00
Ilia Alshanetsky
1c8d05069e MFB: Fixed bug #48512 (DOMDocument::validate() fails with both a E_NOTICE 
and E_WARN if no DTD)
 2009-06-14 13:13:35 +00:00
Rob Richards
f0b4c7be5c MFH: fix bug #47849 (Non-deep import loses the namespace) 
add test
 2009-04-07 15:32:12 +00:00
Rob Richards
63ccee5b41 MFB: fix bug #47430 (Errors after writing to nodeValue parameter of an absent previousSibling) 
add test
 2009-03-13 13:43:29 +00:00
Rob Richards
cbdb8f6167 MFH: fix bug #47220 (segfault in dom_document_parser in recovery mode) 2009-01-26 19:10:53 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Etienne Kneuss
3919b16f04 MFH: Fix #46241 (stacked error_handlers, error_handling in general) 2008-11-19 02:00:53 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Rob Richards
84bfd4040e MFH: fix bug #46191 (BC break: DOMDocument saveXML() doesn't accept null) 2008-09-28 12:00:37 +00:00