mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-15 21:05:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
82,787 Commits 503 Branches 1,384 Tags 823 MiB
9a31d70845
Commit Graph

220 Commits

Author SHA1 Message Date
Stanislav Malyshev
33d3acaae7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)
  5.4.45 next

Conflicts:
	configure.in
	ext/pcre/php_pcre.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_version.h
 2015-09-01 11:42:19 -07:00
Stanislav Malyshev
1744be2d17 Fix for bug #69782 2015-08-16 17:16:15 -07:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Rodrigo Prado de Jesus
813830e763 added various tests for XSLTProcessor and one test for iconv extension 2014-09-28 20:29:29 -03: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
fca1501ed6 added test for bug #53965 2014-04-01 10:08:08 +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
e4b310d2a9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #49634x
 2013-12-02 12:10:59 +01:00
Michael Wallner
6408a1a59e fix bug #49634x 2013-12-02 12:10:00 +01:00
Christopher Jones
39612afc72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c
 2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489 Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. 2013-08-14 20:36:50 -07:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07: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
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Stanislav Malyshev
a3322f8927 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
 2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
Johannes Schlüter
b025b9d0cf Fix #62432 ReflectionMethod random corrupt memory on high concurrent 
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
 2012-06-27 23:26:33 +02:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00: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
Christian Stocker
777a29fce2 Added the xsl.security_prefs option to 5_4 and trunk and 
mark it as deprecated for BC-reasons
Added tests for ini option and combination of both
 2011-10-10 07:59:19 +00:00
Christian Stocker
65ee77c4b0 Added the xsl.security_prefs option to 5_4 and trunk and 
mark it as deprecated for BC-reasons
Added tests for ini option and combination of both
 2011-10-10 07:59:19 +00:00
Christian Stocker
eb039d5783 Added the xsl.security_prefs option to 5_4 and trunk and 
mark it as deprecated for BC-reasons
Added tests for ini option and combination of both
 2011-10-10 07:59:19 +00:00
Christian Stocker
c9b5d92821 Fix wrong comment 
Add new xsl ini options to php.ini
 2011-10-06 18:30:55 +00:00
Christian Stocker
192511f75d Added test for Bug 54446 
Init a variable to a default value to avoid issues
 2011-10-05 18:11:29 +00:00
Christian Stocker
b2287a42a0 Added xsl.security_prefs ini option to define forbidden operations within XSLT 
stylesheets, default is not to enable write operations. This option won't be 
in 5.4, since there's a new method. Bug #54446
 2011-10-05 09:56:01 +00:00
Christian Stocker
cc2fd64121 Added test for XSL bug 54446 2011-09-12 12:44:49 +00:00
Christian Stocker
f8ffb5af1d Added test for XSL bug 54446 2011-09-12 12:44:49 +00:00
Christian Stocker
2e2eb5e137 Revert r316043, the tests are different on purpose 2011-09-05 08:27:47 +00:00
Christian Stocker
72d0abc8d3 Revert r316043, the tests are different on purpose 2011-09-05 08:27:47 +00:00
Shein Alexey
2d52a6934a Synchronized fixed tests from 5.3 branch. 2011-09-02 18:01:20 +00:00
Shein Alexey
712628c47c Synchronized fixed tests from 5.3 branch. 2011-09-02 18:01:20 +00:00
Christian Stocker
bbecdf57d3 fix xsl tests 2011-08-31 09:16:04 +00:00
Christian Stocker
01e115324a - Set an empty string and avoid warnings and stopping of the transformation process 
when a php function can't be called.
- Fixed tests.
 2011-08-31 09:14:08 +00:00
Christian Stocker
6873ef7055 - Set an empty string and avoid warnings and stopping of the transformation process 
when a php function can't be called.
- Fixed tests.
 2011-08-31 09:14:08 +00:00
Christian Stocker
190e36b47a MFB. fix xsl date tests 2011-08-31 07:38:19 +00:00
Christian Stocker
4297b67aee fix xsl date tests 2011-08-29 11:44:30 +00:00
Christian Stocker
5250f01d15 fix xsl date tests 2011-08-29 11:44:30 +00:00
Ilia Alshanetsky
9c297247ef Another build fix relating to previous DOM commit 2011-08-08 16:49:43 +00:00
Ilia Alshanetsky
e35f670e2d Another build fix relating to previous DOM commit 2011-08-08 16:49:43 +00:00
Ilia Alshanetsky
0b3cb3f220 Fixed build 2011-08-08 16:06:40 +00:00
Ilia Alshanetsky
022d279a98 Fixed build 2011-08-08 16:06:40 +00:00
Pierrick Charron
caff611cf3 Remove unused variables 2011-08-07 06:37:22 +00:00
Pierrick Charron
e03d19a00e Remove unused variables 2011-08-07 06:37:22 +00:00
Felipe Pena
997f323e3a - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00