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
dbddbcc950
remove unused var
2014-11-14 17:39:40 +01:00
b7eee5bfaf
added comment
2014-11-14 17:39:39 +01:00
8434a7f2ab
validate sockets portable way
2014-11-14 17:39:38 +01:00
e1d0ca7cae
fix unused var warning
2014-11-14 17:39:37 +01:00
3b4a6dc114
removed useless check
...
the offset member is an unsigned
2014-11-14 17:39:35 +01:00
871dc9febc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #68423i PHP-FPM will no longer load all pools
2014-11-14 17:33:14 +01:00
d66640a334
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68423i PHP-FPM will no longer load all pools
2014-11-14 17:32:46 +01:00
23db119768
Fix bug #68423i PHP-FPM will no longer load all pools
...
The hash need to be unique per IP + Port
Previous version have (IPv4 only)
sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
2014-11-14 17:29:31 +01:00
706e5aabd1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS for 1b15620744
2014-11-14 10:59:04 +01:00
063a06b8e5
NEWS for 1b15620744
2014-11-14 10:58:27 +01:00
e6ea376a91
avoid repeated strlen usage, remove unused vars
2014-11-13 19:57:34 +01:00
14ccac0237
fix datatype mismatch
2014-11-13 19:57:33 +01:00
e5acd78f7a
fix datatype mismatch
2014-11-13 19:57:32 +01:00
50825aa879
extend warn list to exclude
2014-11-13 19:57:31 +01:00
5f81cfe097
fix datatype mismatch and kick unused var
2014-11-13 19:57:30 +01:00
c865472ef0
fix datatype mismatches, remove dead part of code
2014-11-13 19:57:29 +01:00
cf979ca6fe
remove unused vars
2014-11-13 19:57:28 +01:00
0f7f800d8a
added missing type specifier
2014-11-13 19:57:27 +01:00
1f432c85b0
Micro optimization
2014-11-13 17:36:08 +03:00
b75bd26096
fix merge
2014-11-13 13:09:44 +01:00
1b15620744
Fix build with gmp < 4.2
...
See 3d6d863ccbacd7fcf55f
2014-11-13 13:08:00 +01:00
9b19f516a5
add a configure option to suppress uncritical warns with clang
2014-11-13 11:43:01 +01:00
b6c8349be0
pass vc++ version to clang, that will be forwarded to _MSC_VER
2014-11-13 11:20:09 +01:00
191fe09e33
HAVE_STRNLEN should be in all toolsets
2014-11-13 10:47:57 +01:00
8644f4624c
set the vc++ next name
2014-11-13 08:18:40 +01:00
6771f5590c
Another fix for test fail
2014-11-13 14:23:25 +08:00
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
c80069c298
Merge branch 'master' of https://git.php.net/repository/php-src
2014-11-13 12:54:17 +08:00
39913c4cdf
Fixed test fails (prop read always has a IS_STRING member now)
2014-11-13 12:47:03 +08:00
4d7a21d0f2
pre create the build dir
...
otherwise response file generation might fail
2014-11-12 19:06:09 +01:00
29b28f7ce6
fix test cleanup
...
this could leave garbage after it as the test file is removed in
flush (the fd could still be opened)
2014-11-12 18:05:24 +01:00
d7a0046468
fix test cleanup
2014-11-12 17:57:20 +01:00
f00cf67d1e
C89 compat
2014-11-12 17:57:19 +01:00
15f419a635
trim when adding flags, avoid multiple spaces
2014-11-12 17:57:18 +01:00
988112a2e1
use response files for exts and sapi linking
2014-11-12 17:57:17 +01:00
1acbcdeb27
generate response files for use by linker
...
Object dir path can under circumstances cause that the expanded
command line exceeds the length allowed by the OS. Linker can read
the object lists from a file which eliminates this issue.
2014-11-12 17:57:17 +01:00
79c61c71c2
generalize arch setup
2014-11-12 17:57:16 +01:00
54868c84ce
fix int to void* cast on x64
2014-11-12 17:57:15 +01:00
55e01cda7a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed NEWS
2014-11-12 16:54:33 +01:00
86127a077f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed NEWS
2014-11-12 16:54:17 +01:00
faaea4f304
Fixed NEWS
...
Some entries had been mistakenly removed in ad468d20b1
2014-11-12 16:51:26 +01:00
428f36198e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
2014-11-12 14:51:39 +01:00
00e763f499
update NEWS
2014-11-12 14:51:18 +01:00
37143666d4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
2014-11-12 14:46:07 +01:00
fea84a1c9c
update NEWS
2014-11-12 14:45:39 +01:00
7691e58d30
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
2014-11-12 14:29:11 +01:00
5f15d6f0d8
update NEWS
2014-11-12 14:28:45 +01:00
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
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
Anatol Belski