Commit Graph

9077 Commits

Author SHA1 Message Date
Dmitry Stogov
4e48bff3ce Removed deprecated checks 2014-12-15 16:42:28 +03:00
Dmitry Stogov
381bd80a79 Fixed test 2014-12-15 12:52:50 +03:00
Andrea Faulds
7950429626 Revert HTTP status codes merger
This reverts commits 65768edcf3, 627b350f31 and 9c18ad3ac9.
2014-12-15 01:30:58 +00:00
Andrea Faulds
9c18ad3ac9 fixed tests, bugs in status codes merger 2014-12-14 23:41:11 +00:00
Kalle Sommer Nielsen
ad01fd8b49 Fixed bug #55415 (php_info produces invalid anchor names)
@@ Slightly based off Johannes' patch
2014-12-14 23:09:13 +01:00
Kalle Sommer Nielsen
d82fa2273f Implement feature request #55467 (phpinfo: PHP Variables with $ and single quotes) 2014-12-14 22:47:58 +01:00
Kalle Sommer Nielsen
6b8ed592b9 Change back to use is_int() as function instead of is_integer(), as per Jan Tvrdík's request @github 2014-12-14 22:26:16 +01:00
Kalle Sommer Nielsen
04c11f918a Change is_long() to be an alias of is_integer()
@@ See internals: news.php.net/php.internals/79639
@@ Manual will be updated so that is_int() will be an alias of is_integer()
@@ I picked integer over int for consitentcy as we do not use str instead of string either
2014-12-14 21:57:07 +01:00
Andrea Faulds
2cca4d0193 Fix undefined behaviour in strnatcmp 2014-12-13 22:06:27 +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
Julien Pauli
446eed10ee Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated NEWS
  Updated NEWS
  Fix bug #68532: convert.base64-encode omits padding bytes
2014-12-12 16:51:50 +01:00
Julien Pauli
a0d848f795 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS
  Fix bug #68532: convert.base64-encode omits padding bytes
2014-12-12 16:50:42 +01:00
mcq8
86f1875536 Fix bug #68532: convert.base64-encode omits padding bytes 2014-12-12 16:42:38 +01:00
Dmitry Stogov
381438e5df Improved array_merge() and array_replace() (1-st array may be added using simple procedure). 2014-12-11 19:18:31 +03:00
Anatol Belski
92a9477cc3 Merge branch 'PHP-5.6'
* PHP-5.6:
  move the test to the right place
2014-12-10 13:23:15 +01:00
Anatol Belski
21da246807 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  move the test to the right place
2014-12-10 13:22:52 +01:00
Anatol Belski
c5f7dcd1dc move the test to the right place 2014-12-10 13:19:51 +01:00
Anatol Belski
aeb30576f6 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed bug #68545 NULL pointer dereference in unserialize.c
  Updated NEWS
  Updated NEWS

Conflicts:
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
2014-12-10 11:54:31 +01:00
Anatol Belski
4a82cdce66 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #68545 NULL pointer dereference in unserialize.c

Conflicts:
	ext/standard/var_unserializer.c
2014-12-10 11:47:34 +01:00
Anatol Belski
20d93534d5 Fixed bug #68545 NULL pointer dereference in unserialize.c 2014-12-10 11:43:33 +01:00
Nikita Popov
204e3f8d5a Drop unnecessary zval containers 2014-12-06 12:38:56 +01: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
42d7cb4c2c Merge branch 'PHP-5.6'
* PHP-5.6:
  C89 compat
  add include for missing localeconv_r proto
2014-12-06 12:18:36 +01:00
Anatol Belski
08241ee3f3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  C89 compat
  add include for missing localeconv_r proto
2014-12-06 12:18:05 +01:00
Anatol Belski
373aa7c81f add include for missing localeconv_r proto 2014-12-06 12:09:35 +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
Anatol Belski
6cf5ac7567 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dir separators in test
2014-12-05 07:08:35 +01:00
Anatol Belski
c65143d571 fix dir separators in test 2014-12-05 07:07:58 +01:00
Remi Collet
8199278ffb Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
2014-12-02 08:41:35 +01:00
Remi Collet
6f3714a8fc Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
Covered by ext/standard/tests/strings/pack64.phpt
2014-12-02 08:38:39 +01:00
Remi Collet
9aabfeb6c4 fix string is optional, set default length, thanks laruence 2014-12-02 07:41:35 +01:00
Remi Collet
67fc5d6bbb Fix type of string length in zpp call
Fix 23 failed tests (detected on bigendian)
2014-12-02 07:06:10 +01:00
Tjerk Meesters
7ccd7b5975 Added more useful warning messages 2014-11-30 22:42:31 -08:00
Tjerk Meesters
0109eb07cf Changed based on comments and make its behaviour equal to the Windows version 2014-11-30 22:42:31 -08:00
Tjerk Meesters
f2b7aeda2b Fix #53092 - dns_get_record does not return false on dns server failure 2014-11-30 22:42:31 -08:00
Tjerk Meesters
bfe7c6988f Added more useful warning messages 2014-11-30 22:42:13 -08:00
Tjerk Meesters
904dca6392 Changed based on comments and make its behaviour equal to the Windows version 2014-11-30 22:42:13 -08:00
Tjerk Meesters
d037785165 Fix #53092 - dns_get_record does not return false on dns server failure 2014-11-30 22:42:13 -08:00
Tjerk Meesters
85e2e6c1fd Added more useful warning messages 2014-11-30 22:39:25 -08:00
Tjerk Meesters
977d84490b Changed based on comments and make its behaviour equal to the Windows version 2014-11-30 22:39:18 -08:00
Tjerk Meesters
7b44790db5 Fix #53092 - dns_get_record does not return false on dns server failure 2014-11-30 22:39:09 -08: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