clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,112 Commits 493 Branches 1,365 Tags 848 MiB
615b0ec7f5
Commit Graph

36667 Commits

Author SHA1 Message Date
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
Anatol Belski
8434a7f2ab validate sockets portable way 2014-11-14 17:39:38 +01:00
Anatol Belski
3b4a6dc114 removed useless check 
the offset member is an unsigned
 2014-11-14 17:39:35 +01:00
Anatol Belski
e5acd78f7a fix datatype mismatch 2014-11-13 19:57:32 +01:00
Anatol Belski
5f81cfe097 fix datatype mismatch and kick unused var 2014-11-13 19:57:30 +01:00
Anatol Belski
c865472ef0 fix datatype mismatches, remove dead part of code 2014-11-13 19:57:29 +01:00
Xinchen Hui
6771f5590c Another fix for test fail 2014-11-13 14:23:25 +08:00
Xinchen Hui
241b1a7840 Revert "Fixed test fails (prop read always has a IS_STRING member now)" 
This reverts commit 39913c4cdf.
 2014-11-13 14:16:08 +08:00
Xinchen Hui
c80069c298 Merge branch 'master' of https://git.php.net/repository/php-src 2014-11-13 12:54:17 +08:00
Xinchen Hui
39913c4cdf Fixed test fails (prop read always has a IS_STRING member now) 2014-11-13 12:47:03 +08:00
Anatol Belski
d7a0046468 fix test cleanup 2014-11-12 17:57:20 +01:00
Matteo Beccati
1f1b412e5a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
  Remove unneeded md5 hashing from PHP-5.6 branch. It's removed from master already by my previous commit.

Conflicts:
	ext/session/session.c
 2014-11-12 11:23:24 +01:00
Matteo Beccati
07655ffe7e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
 2014-11-12 11:22:48 +01:00
Matteo Beccati
65fee90462 Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64 2014-11-12 11:21:11 +01:00
Yasuo Ohgaki
9e072d9565 Remove unneeded md5 hashing from PHP-5.6 branch. 
It's removed from master already by my previous commit.
 2014-11-12 13:43:54 +09: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
Derick Rethans
3e8975bc95 Merge branch 'PHP-5.6' 2014-11-11 14:01:31 -03:00
Derick Rethans
a19d96fc58 Merge branch 'PHP-5.5' into PHP-5.6 2014-11-11 14:01:26 -03:00
Derick Rethans
695a102ede - Updated to version 2014.10 (2014j) 2014-11-11 14:01:24 -03:00
Xinchen Hui
75b6f97334 Merge branch 'PHP-5.6' 
Conflicts:
	ext/soap/soap.c
 2014-11-11 16:31:32 +08:00
Xinchen Hui
e003c56c74 Merge branch 'PHP-5.5' into PHP-5.6 2014-11-11 16:23:18 +08:00
Xinchen Hui
327d4f9afb Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes) 2014-11-11 16:22:49 +08:00
Rasmus Lerdorf
96c5c1ef59 Fix skipif test here 2014-11-10 10:42:57 -08:00
Rasmus Lerdorf
bff7dc70d8 Fix skipif test here 2014-11-10 10:42:17 -08:00
Rasmus Lerdorf
1e5077d1e8 Fix skipif test here 2014-11-10 10:41:18 -08:00
Anatol Belski
af7e3064f3 rename intel toolset to icc - shorter 2014-11-07 19:24:17 +01:00
Anatol Belski
7d7182e1b0 fix gd compilation with icc toolset 2014-11-07 19:13:41 +01:00
Anatol Belski
b9f1daa976 basic clang compatibility on windows 2014-11-07 10:17:59 +01:00
Dmitry Stogov
2afb5df4da Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix opcache.revalidate_freq per-request behavior

Conflicts:
	ext/opcache/ZendAccelerator.h
 2014-11-07 10:24:25 +03:00
Dmitry Stogov
e6581d52cc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix opcache.revalidate_freq per-request behavior
 2014-11-07 10:17:48 +03:00
Dmitry Stogov
033abd6d77 Fix opcache.revalidate_freq per-request behavior 2014-11-07 10:16:25 +03:00
Dmitry Stogov
45719aee26 fixed compilation error 2014-11-07 09:55:13 +03:00
Matteo Beccati
f5130c3058 Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) 2014-11-06 16:35:49 +01:00
Matteo Beccati
8fccf0bac9 Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) 2014-11-06 16:34:47 +01:00
Matteo Beccati
8fdc4d8797 Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) 2014-11-06 15:47:32 +01:00
Dmitry Stogov
75041379a6 Improved object property access. 2014-11-06 14:50:03 +03:00
Yasuo Ohgaki
6b8328de74 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
  Fixed 2 tests that expects bool retrun value from save handler.

Conflicts:
	ext/session/session.c
 2014-11-06 13:49:43 +09:00
Yasuo Ohgaki
4dd3fbfcd2 Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini 2014-11-06 13:06:29 +09:00
Anatol Belski
4b8cc567cd Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix dir separator in test
 2014-11-05 15:43:37 +01:00
Anatol Belski
d4050f42fd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separator in test
 2014-11-05 15:43:13 +01:00
Anatol Belski
53266476e6 fix dir separator in test 2014-11-05 15:42:45 +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
Stanislav Malyshev
bf59acdea7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  set default response code to 200
  set default response code to 200
  fix NEWS & version
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib

Conflicts:
	ext/pcre/php_pcre.c
 2014-11-03 11:40:15 -08:00
Stanislav Malyshev
90ba99a2c2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  set default response code to 200
  fix NEWS & version
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib
 2014-11-03 11:38:29 -08:00