1
0
mirror of https://github.com/php/php-src.git synced 2026-04-23 16:08:35 +02:00
Commit Graph

332 Commits

Author SHA1 Message Date
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Stanislav Malyshev de4a2c3cbd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:37:29 -08:00
Stanislav Malyshev cbcf6e1880 Fix bug #65873 - Integer overflow in exif_read_data() 2013-12-16 11:34:24 -08:00
Michael Wallner cfd911473b Merge branch 'PHP-5.5'
* PHP-5.5:
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
2013-10-21 22:16:21 +02:00
Michael Wallner 2fa5f39e4c add tests for bug #62523 2013-10-21 22:15:09 +02:00
Michael Wallner 1b43f95040 Merged PR #293 (Exif crash on unknown encoding was fixed)
By:
	Draal
Conflicts:
	configure.in
	main/php_version.h
2013-10-21 21:48:27 +02:00
Michael Wallner 14caf174ff unify stdint type usage
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Veres Lajos e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos 1b06e0be96 typo fixes 2013-07-15 00:19:49 -07:00
Stanislav Malyshev 02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -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
Nikita Popov 49e91151c0 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-14 17:37:10 +02:00
Nikita Popov e1c610fb44 Fix exif test failure
There are two slightly different error messages for invalid pointers, so
make the pattern slightly less strict to account for both.
2012-08-14 17:33:38 +02:00
Felipe Pena 8779a9aad5 Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.4 2012-06-03 19:01:50 -03:00
Felipe Pena e59b6dc0ae - Fixed information leak in ext exif (discovered by Martin Noga, Matthew "j00ru" Jurczyk, Gynvael Coldwind) 2012-06-03 15:23:07 -03:00
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Stanislav Malyshev 4c4185c117 fix test number 2011-11-19 04:49:59 +00:00
Stanislav Malyshev 1dfbe61e2a fix bug #60150 for 5.3 too 2011-11-19 04:49:36 +00:00
Stanislav Malyshev 5ebfe19ac6 Fix bug #60150 (Integer overflow during the parsing of invalid exif header) 2011-11-19 04:41:03 +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
Felipe Pena 23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena 4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Pierrick Charron 824726073b Delete empty test files (old MQ tests) 2011-07-22 12:12:05 +00:00
Pierre Joye 45420bb669 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ, missing tests changes in 5.4 2011-07-22 11:56:20 +00:00
Pierre Joye 9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +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
Ilia Alshanetsky 465ffa7fa2 Fixed bug #54121 (error message format string typo). 2011-04-12 18:33:08 +00:00
Ilia Alshanetsky 0e80f26207 Fixed bug #54121 (error message format string typo). 2011-04-12 18:33:08 +00:00
Dmitry Stogov bbc879b587 Fixed multibyte related issues 2011-03-14 16:00:59 +00:00
Pierre Joye 2a7acc3f4d - fix the fix (Dmitry) and ensure that it builds everywhere, can someone test on solaris&co pls? 2011-02-15 14:02:26 +00:00
Pierre Joye a8806be989 - fix the fix (Dmitry) and ensure that it builds everywhere, can someone test on solaris&co pls? 2011-02-15 14:02:26 +00:00
Pierre Joye 409c5a9c7b -Bug #54002, fix windows build, use the relevant values in the warnings 2011-02-14 09:40:10 +00:00
Pierre Joye 8a485c7c91 -Bug #54002, fix windows build, use the relevant values in the warnings 2011-02-14 09:40:10 +00:00
Pierre Joye dbccc8c112 - fix bug #54002, exif_read_data crashes on crafted tags 2011-02-14 09:08:44 +00:00
Pierre Joye 0f842f667a - fix bug #54002, exif_read_data crashes on crafted tags 2011-02-14 09:08:44 +00:00
Felipe Pena 927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena 0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Moriyoshi Koizumi e8b1590667 - Fix build. 2010-12-22 10:25:33 +00:00
Antony Dovgal e89362b846 fix ZTS build 2010-12-08 12:35:25 +00:00
Dmitry Stogov 755c2cd0d8 Removed compile time dependency from ext/mbstring 2010-12-08 11:27:34 +00:00
Kalle Sommer Nielsen a448b6a72b MFB53: Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED (Fixes #52570)
# Some of the updated tests were to make them sync with 5.3 although they don't run on trunk anymore
2010-08-11 21:41:30 +00:00
Kalle Sommer Nielsen 8deefa8780 Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED (Fixes #52570)
# Trunk patch will follow shortly
2010-08-11 21:12:18 +00:00
Rob Richards 0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Kalle Sommer Nielsen dd8e59da8f Removed safe_mode
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00