Lior Kaplan
2fd74c7f03
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix typo: unitialized -> uninitialized
2015-04-01 18:20:26 +03:00
Lior Kaplan
59c2a55ec7
Fix typo: unitialized -> uninitialized
2015-04-01 18:17:53 +03:00
Stanislav Malyshev
e18ec95687
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.38 next
Fix bug #68799 : Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
ext/standard/var_unserializer.c
2015-01-20 10:40:39 -08:00
Stanislav Malyshev
e2744c51b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.38 next
Fix bug #68799 : Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
configure.in
main/php_version.h
2015-01-20 10:40:11 -08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Stanislav Malyshev
2fc178cf44
Fix bug #68799 : Free called on unitialized pointer
2015-01-11 00:51:05 -08:00
Anatol Belski
3578e5b250
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
fork test for windows
update for LiteSpeed
2014-11-24 16:25:38 +01:00
Anatol Belski
09f2355eec
fix dir separator in test
2014-11-24 16:14:17 +01:00
Stanislav Malyshev
f9ba0a157f
Fix bug #68113 (Heap corruption in exif_thumbnail())
2014-10-14 10:45:36 -07:00
Stanislav Malyshev
ddb207e7fa
Fix bug #68113 (Heap corruption in exif_thumbnail())
2014-10-14 10:44:00 -07:00
Stanislav Malyshev
287c91c1f0
Fix bug #68113 (Heap corruption in exif_thumbnail())
2014-10-13 23:17:45 -07:00
Stanislav Malyshev
e35945490f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove superfluous echos.
2014-06-08 13:53:01 -07:00
Jeff Welch
5fd7c2b01d
Remove superfluous echos.
2014-06-08 13:50:22 -07:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +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