php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 04:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
86,523 Commits 547 Branches 1,481 Tags
8199278ffb2a2a16bcec191455f38d37fa3a292d
Commit Graph

86523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
196b768928 NEWS 2014-12-02 08:40:52 +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
Anatol Belski
6ae09ddf49 Merge branch 'PHP-5.6' 
* PHP-5.6:
  one more refix to the test
 2014-12-01 19:10:44 +01:00
Anatol Belski
c45fcfd063 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  one more refix to the test
 2014-12-01 19:10:18 +01:00
Anatol Belski
a0c03a3ec5 one more refix to the test 2014-12-01 19:09:39 +01:00
Remi Collet
65ad2aadea cleanup uneeded cast 2014-12-01 19:06:16 +01:00
Anatol Belski
1b8b384b11 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix dir separator in test
 2014-12-01 18:56:14 +01:00
Anatol Belski
fe4a5abf30 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separator in test
 2014-12-01 18:55:52 +01:00
Anatol Belski
b6d624e54e fix dir separator in test 2014-12-01 18:55:20 +01:00
Remi Collet
4d16ca0beb Fix type of string lengths. 
Those values are used in various call (including zpp) where
a size_t is expected.

This fix 82 failed test on ppc64
(bigendian is perfect to detect stack issue)
 2014-12-01 16:10:44 +01:00
Anatol Belski
c64ce84cd6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix possible null pointer math
 2014-12-01 14:43:43 +01:00
Anatol Belski
f33bd9c846 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix possible null pointer math
 2014-12-01 14:43:22 +01:00
Anatol Belski
cb6dea6ea8 fix possible null pointer math 2014-12-01 14:40:35 +01:00
Gustavo Frederico Temple Pedrosa
87e0802a99 PowerPC64 support in long multiplication 
In long integer multiplications, avoid casting
both operands to long double and use an inline
assembly-based overflow checking function instead.
 2014-12-01 10:55:53 +01:00
Ferenc Kovacs
d04685732e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.
 2014-12-01 10:15:42 +01:00
Ferenc Kovacs
d964832255 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.

Conflicts:
	.travis.yml
 2014-12-01 10:14:32 +01:00
Ferenc Kovacs
a3a0e49586 Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back. 
This reverts commit 5515937073.
 2014-12-01 10:12:06 +01:00
Anatol Belski
49de5b7aed Merge branch 'PHP-5.6' 
* PHP-5.6:
  add include for missing usleep proto
  C89 compat
  Added more useful warning messages
  Changed based on comments and make its behaviour equal to the Windows version
  Fix #53092 - dns_get_record does not return false on dns server failure
  Fix php cli (-S option) inconsistent port parsing

Conflicts:
	main/streams/plain_wrapper.c
 2014-12-01 08:32:12 +01:00
Anatol Belski
c370683903 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add include for missing usleep proto
  C89 compat
  Added more useful warning messages
  Changed based on comments and make its behaviour equal to the Windows version
  Fix #53092 - dns_get_record does not return false on dns server failure
  Fix php cli (-S option) inconsistent port parsing
 2014-12-01 08:30:59 +01:00
Anatol Belski
c1ec815fae add include for missing usleep proto 2014-12-01 08:27:46 +01:00
Anatol Belski
f4a0e601ee C89 compat 2014-12-01 08:24:44 +01:00
Stanislav Malyshev
a41412cdf0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added more useful warning messages
  Changed based on comments and make its behaviour equal to the Windows version
  Fix #53092 - dns_get_record does not return false on dns server failure
  Fix php cli (-S option) inconsistent port parsing
 2014-11-30 22:44:02 -08: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
nil0x42
2534671f0b Fix php cli (-S option) inconsistent port parsing 
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
 2014-11-30 22:42:30 -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
nil0x42
2a73d56ef9 Fix php cli (-S option) inconsistent port parsing 
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
 2014-11-30 22:42:12 -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
nil0x42
a87300241f Fix php cli (-S option) inconsistent port parsing 
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
 2014-11-30 22:29:24 -08:00
Remi Collet
4ba828652b Merge branch 'PHP-5.6' 
* PHP-5.6:
  XFAIL as catch_workers_output = yes seems not reliable
 2014-12-01 07:29:19 +01:00
Remi Collet
cb1a297bf4 XFAIL as catch_workers_output = yes seems not reliable 2014-12-01 07:28:49 +01:00
Stanislav Malyshev
7efd03eadc Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
  Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
  fix ZTS

Conflicts:
	ext/curl/multi.c
	ext/date/php_date.c
 2014-11-30 22:22:50 -08:00
Stanislav Malyshev
8b2a8c46b0 Merge branch 'pull-request/728' 
* pull-request/728:
  Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
  Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)

Conflicts:
	ext/curl/multi.c
 2014-11-30 22:22:15 -08:00
Stanislav Malyshev
e0b6e5222b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
  Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
 2014-11-30 22:22:01 -08:00
Stanislav Malyshev
f75da60b18 update NEWS 2014-11-30 22:19:24 -08:00
Jille Timmermans
1b4368db77 Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set) 2014-11-30 22:18:22 -08:00
Jille Timmermans
7049d3450e Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set) 2014-11-30 22:18:12 -08:00
Stanislav Malyshev
85bada10c1 fix ZTS 2014-11-30 21:50:29 -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
Stanislav Malyshev
f7eedbe9a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update news

Conflicts:
	ext/standard/crypt.c
 2014-11-30 21:38:30 -08:00
Stanislav Malyshev
84be568366 update news 2014-11-30 21:37:39 -08:00