clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 11:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,534 Commits 493 Branches 1,366 Tags 849 MiB
e031f212b2
Commit Graph

9029 Commits

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
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
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
Stanislav Malyshev
b564e7b0de Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update NEWS
  fix typo
  Added test and review suggestion
  Fix bug #68335: rmdir doesnt work with file:// stream wrapper
 2014-11-30 17:35:11 -08:00
Stanislav Malyshev
60d5b2ec24 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added test and review suggestion
  Fix bug #68335: rmdir doesnt work with file:// stream wrapper
 2014-11-30 17:07:02 -08:00
mcq8
04808aa7e1 Added test and review suggestion 2014-11-30 16:38:20 -08: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
Alexander Lisachenko
a5aae1b66c Fix incorrect argument reflection info for array_multisort() 2014-11-23 16:38:30 -08:00
Stanislav Malyshev
3f263c44f4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix incorrect argument reflection info for array_multisort()
 2014-11-23 16:32:57 -08:00
Alexander Lisachenko
a023e032b9 Fix incorrect argument reflection info for array_multisort() 2014-11-23 16:29:15 -08:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -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
Stanislav Malyshev
9d7c5dbed9 secured unserialize 
- update for BC-compatible unserialize
- add tests
 2014-11-22 22:25:18 -08:00
Anatol Belski
bcd9c6b256 Merge branch 'PHP-5.6' 
* PHP-5.6:
  added test for things done so far for bug #66265
  partially fixed bug #66265
  forked bug67052.phpt for Windows
 2014-11-21 10:25:18 +01:00
Anatol Belski
0581e877a5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added test for things done so far for bug #66265
  partially fixed bug #66265
  forked bug67052.phpt for Windows
 2014-11-21 10:24:53 +01:00
Anatol Belski
56fac96bec partially fixed bug #66265 
NTS mode should additionally use _putenv to satisfy libs like gettext
relying on _getenv. As _putenv isn't thread safe, it wouldn't bring
much for the TS mode as it would change locale across all the threads
and require locking to avoid random fails with concurrent _getenv
calls.
 2014-11-21 09:57:12 +01:00
Anatol Belski
00c856250f fix test 2014-11-20 14:35:04 +01:00
Veres Lajos
4b9535341a typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-19 20:23:00 +00:00
Anatol Belski
5400f92c75 proper dllexport 2014-11-18 15:38:35 +01:00
Anatol Belski
376a366f0c move to size_t where zend_string is used internally 2014-11-18 13:19:53 +01:00
Anatol Belski
f8f86a44ef return after the warning, to fix uninitialized salt usage 2014-11-18 13:19:52 +01:00
Anatol Belski
82c2e3f201 fix build 
ifdef this var declaration to avoid the vs warning
 2014-11-14 22:19:41 +01:00
Anatol Belski
a85ce501da partial cleanup to work with size_t str length in password_hash 
php_crypt() and co use int, though this is fair enough. Could
be refactored later for tidiness reasons.
 2014-11-14 17:39:41 +01:00
Anatol Belski
dbddbcc950 remove unused var 2014-11-14 17:39:40 +01:00
Stanislav Malyshev
32fd4590a5 fix loop - size_t is unsigned so can not be negative 2014-11-11 16:34:50 -08:00
Stanislav Malyshev
1b143f4033 fix loop - size_t is unsigned so can not be negative 2014-11-11 16:33:02 -08:00
Stanislav Malyshev
4571cc2195 fix copypaste error 2014-11-11 16:33:02 -08:00
Anatol Belski
b9f1daa976 basic clang compatibility on windows 2014-11-07 10:17:59 +01:00
Bob Weinand
90b4ec51ad Fix bad merge 2014-11-04 18:23:20 +01:00
Bob Weinand
ad8ee74225 Merge remote-tracking branch 'origin/PHP-5.6' 
Conflicts:
	ext/standard/file.c
 2014-11-04 17:16:49 +01:00
Bob Weinand
342d56b23d arg1-3 are not variable names to use; removed useless buffer variable 2014-11-04 16:59:32 +01:00
Anatol Belski
d77ce31763 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix output globals importing
  export output globals
  use portable strndup implementation
  unix sockets aren't available on windows
  dll export APIs needed by phpdbg
  fix sapi/phpdbg/config.w32
  Don't treat warnings as failures in the junit output
 2014-10-29 20:04:56 +01:00
Anatol Belski
fdbfcc0b51 dll export APIs needed by phpdbg 2014-10-29 19:32:52 +01:00
Matteo Beccati
551cb82a59 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now
 2014-10-29 11:32:57 +01:00
Matteo Beccati
eb4e4b7bca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now

Conflicts:
	configure.in
	main/php_version.h
 2014-10-29 11:32:12 +01:00
Matteo Beccati
daf9357d27 Fixed test to work with recent libcurl versions 2014-10-29 11:28:27 +01:00
Anatol Belski
e7945419dd fix datatype mismatches 2014-10-28 17:24:56 +01:00
Anatol Belski
11b119d526 fix datatype mismatches 2014-10-27 16:38:47 +01:00