Commit Graph

736 Commits

Author SHA1 Message Date
Anatol Belski
ce9f52adcd Merge branch 'PHP-5.6'
* PHP-5.6:
  moved the part of the test into an appropriate place
2015-02-08 14:13:39 +01:00
Anatol Belski
979020fcad moved the part of the test into an appropriate place 2015-02-08 14:10:52 +01:00
Anatol Belski
371db55871 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix another invalid free of CG(interned_empty_string)
  add tests for #68996
  Fixed #68790 (Missing return)
  Invalid free of CG(interned_empty_string)

Conflicts:
	ext/soap/soap.c
	ext/wddx/wddx.c
	main/main.c
	sapi/litespeed/lsapi_main.c
2015-02-08 12:43:22 +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
c408c80886 Merge branch 'pull-request/989'
* pull-request/989:
  Fix a few tests and remove error/warning for *0
  Fix spaces -> tabs
  Add deprecated notice to invalid DES salts.
2015-01-31 22:04:39 -08:00
Nikita Popov
d133e68bab Remove support for hex number from is_numeric_string 2015-01-28 22:54:17 +01:00
Márcio Almada
927ebc9789 add another test to #1022 2015-01-27 07:16:22 -03:00
Márcio Almada
1c0dcb268c add failing test for string_replace and array replaces with references
```
make test TESTS=ext/standard/tests/strings/str_replace_*.phpt
```
2015-01-27 07:16:22 -03:00
Reeze Xia
bdfe4d6558 Fix one more leak when wrong $needle type provide of strripos 2015-01-23 17:14:39 +08:00
Stanislav Malyshev
b16fdebcf8 Merge branch 'PHP-5.6'
* PHP-5.6:
  5.4.38 next
  Updated NEWS
  Updated NEWS
  Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	ext/exif/exif.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
2015-01-20 10:41:59 -08: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
Andrea Faulds
5c88d11243 Update remaining octal 32-bit tests 2015-01-20 05:54:13 +00:00
Xinchen Hui
0706032b73 Better fix 2015-01-18 21:38:25 -05:00
Xinchen Hui
f3052c5d2f Fixed bug #68852 (broken strrpos with negative offset) 2015-01-18 10:05:27 -05:00
Andrea Faulds
5f29b98051 Error on invalid octal (fixes PHPSadness #31)
Further error checks
2015-01-17 18:50:28 +00:00
Nikita Popov
4c115b6b71 Remove string category support in setlocale() 2015-01-17 18:26:45 +01:00
Xinchen Hui
2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Anthony Ferrara
4a2fe3d0ab Fix a few tests and remove error/warning for *0 2015-01-13 11:49:09 -05:00
Dmitry Stogov
7b4808a647 Fixed bug #68636 (setlocale no longer returns current value per category). 2015-01-09 01:41:13 +03:00
Adam Harvey
ed8ebd6ce4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Calling crypt() with a salt of *0 should always return *1.

Conflicts:
	configure.in
	main/php_version.h
2015-01-08 19:17:53 +00: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
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Andrea Faulds
bae46f307c Unicode Codepoint Escape Syntax 2014-12-19 00:40:59 +00:00
Andrea Faulds
0ea0b591d7 Merge branch 'zppFailOnOverflow'
* zppFailOnOverflow:
  Fix MySQLi tests
  Fixed gd test
  Refactor ZEND_LONG_MAX/MIN checks into ZEND_DOUBLE_FITS_LONG()
  Fixed copy-and-paste error
  Fix more 32-bit tests
  Skip buncha tests on 32-bit
  skip simplexml
  skip posix 32-bit
  skip tests on 32-bit
  Fixes simplexml test
  Fixes posix tests
  Fixes iconv tests
  Marked tests as 32-bit
  Fixed more 32-bit tests
  Fixed some 32-bit tests
  Mark said ext/date tests as 32-bit only
  Fixed ext/date tests broken by zpp error on overflow
  Fixed broken tests
  Make zpp fail if NaN passed for int, or out-of-range float for non-capping int

Conflicts:
	ext/date/tests/getdate_variation7.phpt
	ext/date/tests/localtime_variation3.phpt
2014-12-13 18:38:15 +00:00
Anatol Belski
51bae8805d Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed test
2014-12-06 12:32:16 +01: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
3d68d843cb Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed bug #65230 setting locale randomly broken
2014-12-06 12:01:09 +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
653bba5e60 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:09:27 +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
bfc8d297be Merge branch 'PHP-5.6'
* PHP-5.6:
  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

Conflicts:
	ext/standard/crypt.c
2014-11-30 21:47:40 -08: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
Andrea Faulds
f90b877f41 Refactor ZEND_LONG_MAX/MIN checks into ZEND_DOUBLE_FITS_LONG() 2014-11-29 02:13:20 +00:00
Andrea Faulds
01554bf3e4 Merge branch 'master' into zppFailOnOverflow 2014-11-29 01:45:54 +00:00
Andrea Faulds
65c8edd525 Fix more 32-bit tests 2014-11-29 01:26:34 +00:00
Andrea Faulds
ebaa42302a Skip buncha tests on 32-bit 2014-11-29 01:05:19 +00:00
Anatol Belski
e7a6c15b93 Fixed bug #68225 unpack and X format code
This is done by reverting some parts to the state of pre 7, whereby
that means all the size_t potential isn't exhausted. This might be
a subject of the subsequent fix, the functionality can be ensured
with the supplied test.
2014-11-28 10:22:03 +01:00
Stanislav Malyshev
f782d6710d Merge branch 'PHP-5.6'
* PHP-5.6:
  test to function addcslashes
  test
  Test PHP Init Fail Without Params
  Add my information to this test
  Add a test for the exception cases of readline_read_history
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension
  teste basico da funcao timezone_version_get
2014-11-23 17:26:35 -08:00
marcosptf
49a133dd0b test to function addcslashes
test to function bin2hex
2014-11-23 17:19:56 -08:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00