Edgar R. Sandi
a8d61ab7f0
adding several other testing scenarios of code without coverage in stripcslashes function
2015-06-29 19:20:23 +02:00
Edgar R. Sandi
7acdfdc84e
adding another testing scenario without coverage in setlocale function
2015-06-29 18:15:03 +02:00
Remi Collet
7611d1c41b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Relax a little this test, because random is not reliable
2015-05-28 10:37:39 +02:00
Remi Collet
09b92a3a54
Relax a little this test, because random is not reliable
...
Usual values are 3500-3950, but >4000 can happen.
2015-05-28 10:35:19 +02:00
Stanislav Malyshev
587ddf6ddc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
ext/standard/pack.c
2015-05-12 14:26:06 -07:00
Stanislav Malyshev
c08f9c2c78
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/pack.c
ext/standard/tests/dir/opendir_variation1-win32.phpt
2015-05-12 14:24:15 -07:00
Stanislav Malyshev
9c0813fd48
Add test for bug #69522
2015-05-11 01:10:35 -07:00
Anatol Belski
979020fcad
moved the part of the test into an appropriate place
2015-02-08 14:10:52 +01:00
manuel
cc13d8696f
Fix another invalid free of CG(interned_empty_string)
...
Fixes #68214
2015-02-07 19:17:31 +01:00
manuel
3550cc5fd9
add tests for #68996
2015-02-07 18:52:26 +01: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
Adam Harvey
16b6f6c7f4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Calling crypt() with a salt of *0 should always return *1.
5.5.22 now
Conflicts:
configure.in
main/php_version.h
2015-01-08 19:16:32 +00:00
Adam Harvey
8b0f105761
Calling crypt() with a salt of *0 should always return *1.
2015-01-08 19:13:23 +00:00
Stanislav Malyshev
b585a3aed7
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
2015-01-01 16:19:05 -08:00
Anatol Belski
0854fd8b81
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-12-06 12:31:55 +01:00
Anatol Belski
5d126245a3
fixed test
2014-12-06 12:31:27 +01:00
Anatol Belski
ebaf130a15
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65230 setting locale randomly broken
2014-12-06 12:00:17 +01:00
Anatol Belski
1b4d5ad46a
Fixed bug #65230 setting locale randomly broken
2014-12-06 11:59:43 +01:00
Anatol Belski
0e09e5e6fa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:08:55 +01:00
Anatol Belski
7943f944c2
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:06:06 +01:00
Stanislav Malyshev
720ba67948
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
update news
update NEWS
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
2014-11-30 21:39:49 -08:00
Stanislav Malyshev
abf5b9481b
Merge branch 'pull-request/868' into PHP-5.5
...
* pull-request/868:
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
2014-11-30 21:09:41 -08:00
Leigh
7e870c596d
Bug fixes in light of failing bcrypt tests
...
Conflicts:
ext/standard/crypt.c
2014-11-30 21:06:39 -08:00
Leigh
2d9d10fbbf
Add tests from 1.3. Add missing tests.
...
3 of the missing tests fail. // TODO
2014-11-30 21:05:40 -08:00
marcosptf
49a133dd0b
test to function addcslashes
...
test to function bin2hex
2014-11-23 17:19:56 -08:00
Veres Lajos
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
Leigh
63fd969300
Add 64 bit formats to pack() and unpack()
2014-10-09 21:02:42 +01:00
Tjerk Meesters
f92c9b3ced
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS for #68129
Fixed bug #68129
2014-10-09 08:24:05 +08:00
Tjerk Meesters
d0e51f5ce9
Fixed bug #68129
...
Empty usernames and passwords are now treated differently from no username or password
For example, empty password:
ftp://user:@example.org
Empty username:
ftp://:password@example.org
Empty username and empty password
ftp://:@example.org
2014-10-09 08:21:30 +08:00
Leigh
4e8c876120
Bug fixes in light of failing bcrypt tests
2014-10-07 12:27:57 +01:00
Leigh
a0420a72af
Add tests from 1.3. Add missing tests.
...
3 of the missing tests fail. // TODO
2014-10-07 11:50:36 +01:00
Remi Collet
3e6f176733
only no_NO.ISO-8859-1 have to be ignored
2014-10-01 10:14:14 +02:00
krakjoe
7cbd8f8b8a
remove bogus locale use from test
2014-10-01 10:12:06 +02:00
Lior Kaplan
56d02d564e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
typofixes
2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typofixes
2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1
typofixes
2014-08-17 15:44:02 +03:00
Tjerk Meesters
18feaf9416
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-12 11:10:15 +08:00
Tjerk Meesters
8757e2cab8
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-12 11:08:50 +08:00
Tjerk Meesters
4fc0d46ae7
Fix for bug #34407 - ucwords and title case
...
Added support for ranges like trim() has
2014-07-12 10:44:11 +08:00
Nikita Popov
a91d1bb9a3
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-02 22:40:45 +02:00
Nikita Popov
213e9a0a3c
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-02 22:40:33 +02:00
Nikita Popov
18989420b6
Add test for bug #67151
2014-07-02 22:39:54 +02:00
Stanislav Malyshev
13a3826687
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Fix bug #67249 : printf out-of-bounds read
5.5.13 release date
2014-05-27 12:11:59 -07:00
Stanislav Malyshev
a2f8c9c1ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Fix bug #67249 : printf out-of-bounds read
2014-05-27 12:10:41 -07:00
Stanislav Malyshev
091b7642c2
Fix bug #67249 : printf out-of-bounds read
2014-05-27 11:28:22 -07:00
Stanislav Malyshev
292b2fd3b3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix bug #67253 : timelib_meridian_with_check out-of-bounds read
Fix bug #67252 : convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
2014-05-13 17:03:50 -07:00
Stanislav Malyshev
a03a1ab88c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #67253 : timelib_meridian_with_check out-of-bounds read
Fix bug #67252 : convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
2014-05-13 17:02:09 -07:00
Stanislav Malyshev
1e2818b143
Fix bug #67252 : convert_uudecode out-of-bounds read
2014-05-11 20:29:27 -07:00
Tjerk Meesters
16ae472769
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-09 20:11:07 +08:00