php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-01 05:02:27 +02:00
Code Issues Packages Projects Releases Wiki Activity
86,109 Commits 547 Branches 1,481 Tags
c746dcd7fd87fa4739bf16d65e39375d8ffafb2e
Commit Graph

3499 Commits

Author SHA1 Message Date
Remi Collet
96220027e1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add new FPM test for IPv4/IPv6
 2014-11-17 15:23:33 +01:00
Remi Collet
d8868b654e Add new FPM test for IPv4/IPv6 
Use 9000+PHP_INT_SIZE as poprt
- to avoid using default 9000
- to allow multipole 32/64 bits simultaneous run
 2014-11-17 15:22:04 +01:00
Remi Collet
ab2215deb3 update fpm configuration for #68428 2014-11-17 09:43:51 +01:00
Remi Collet
d9fd670fdc update fpm configuration for #68428 2014-11-17 09:43:23 +01:00
Remi Collet
2c816d0c9b Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #68428 allowed_client is IPv4 only
 2014-11-17 09:23:59 +01:00
Remi Collet
45b17d0f96 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed bug #68428 allowed_client is IPv4 only
 2014-11-17 09:23:26 +01:00
Remi Collet
3a8103ae47 Fixed bug #68428 allowed_client is IPv4 only 2014-11-17 09:22:13 +01:00
Remi Collet
2b1f90af2b Merge branch 'PHP-5.6' 
* PHP-5.6:
  comment about ipv4-mapped in fpm conf
  Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
 2014-11-17 06:59:03 +01:00
Remi Collet
f22e0c0a6a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  comment about ipv4-mapped in fpm conf
  Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
 2014-11-17 06:58:28 +01:00
Remi Collet
4475cbdc85 comment about ipv4-mapped in fpm conf 2014-11-17 06:57:59 +01:00
Remi Collet
4657289e87 Improve fix bug #68421 access.format='%R' doesn't log ipv6 address 
Log IPv4-Mapped-Ipv6 address as IPv4 (not as IPv6)
 2014-11-17 06:53:38 +01:00
Remi Collet
9e3ebd3a0d Merge branch 'PHP-5.6' 
* PHP-5.6:
  improve comments about FPM listen option
 2014-11-16 18:01:01 +01:00
Remi Collet
10a957ed35 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  improve comments about FPM listen option
 2014-11-16 18:00:24 +01:00
Remi Collet
23fd22f9ed improve comments about FPM listen option 2014-11-16 17:59:36 +01:00
Remi Collet
ffbb38dd98 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses
 2014-11-15 08:12:07 +01:00
Remi Collet
9871cf78f6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses
 2014-11-15 08:11:32 +01:00
Remi Collet
1d9bb287c5 Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses 
Restore default behavior when no address configured:
Listen on all IPv4 addresses.

At some time we could consider to switch to all IPv6
but this will be a BC break.
 2014-11-15 08:08:23 +01:00
Remi Collet
13401c8098 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #68421 access.format='%R' doesn't log ipv6 address
 2014-11-14 19:10:43 +01:00
Remi Collet
b7bc907cfd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #68421 access.format='%R' doesn't log ipv6 address
 2014-11-14 19:10:19 +01:00
Remi Collet
5112fdd670 Fix bug #68421 access.format='%R' doesn't log ipv6 address 2014-11-14 19:09:50 +01:00
Remi Collet
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
Remi Collet
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
Remi Collet
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
Anatol Belski
f00cf67d1e C89 compat 2014-11-12 17:57:19 +01:00
Anatol Belski
54868c84ce fix int to void* cast on x64 2014-11-12 17:57:15 +01:00
Anatol Belski
96805364fa fix var declaration used by macro conditions 2014-11-10 23:30:15 +01:00
Anatol Belski
5ad7cad103 fix sprintf spec 2014-11-10 23:30:15 +01:00
Anatol Belski
940e69147e fix var usage only when unistd.h available 2014-11-10 23:30:14 +01:00
Anatol Belski
c3471cc1c9 cleanup unused variable 2014-11-10 23:30:13 +01:00
Anatol Belski
88ba5a625c do portable socket checks 
also introduced a portable macro for that
 2014-11-10 23:30:12 +01:00
George Wang
a8be707bf1 Merge branch 'master' of git.php.net:php-src 2014-11-03 11:44:35 -05:00
George Wang
bba11e3255 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-11-03 11:44:13 -05:00
George Wang
79de59e862 set default response code to 200 2014-11-03 11:43:22 -05:00
George Wang
4435161456 set default response code to 200 2014-11-03 11:43:04 -05:00
George Wang
19f3f4b155 set default response code to 200 2014-11-03 11:42:45 -05:00
Bob Weinand
113f1fd6d5 Temporarily disable wait/xml protocol... 2014-10-30 23:09:57 +01:00
Ferenc Kovacs
12fba83c48 Merge branch 'PHP-5.6' 
* PHP-5.6:
  don't try to send in the test results until we restored qa.php.net
  Fix uninitialized value...
  Don't treat warnings as failures in the junit output
 2014-10-30 18:19:48 +01:00
Bob Weinand
b9d1dc329f Merge phpdbg into PHP-5.6 2014-10-30 13:17:58 +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
fc904569ea fix output globals importing 2014-10-29 20:03:28 +01:00
Anatol Belski
4b8f411d31 use portable strndup implementation 2014-10-29 19:49:20 +01:00
Anatol Belski
f842b8f4be unix sockets aren't available on windows 2014-10-29 19:39:46 +01:00
Anatol Belski
79a4339f1b fix sapi/phpdbg/config.w32 2014-10-29 19:28:21 +01:00
Bob Weinand
3e9138e6b5 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-29 11:44:46 +01:00
Bob Weinand
68b5dd2ba9 Merge phpdbg into PHP-5.6 2014-10-29 11:43:01 +01:00
Remi Collet
770473a648 Merge branch 'PHP-5.6' 
* PHP-5.6:
  cleanup uneeded json
 2014-10-29 07:26:58 +01:00
Remi Collet
7dd871438f cleanup uneeded json 2014-10-29 07:26:41 +01:00
Bob Weinand
4fec48d1b0 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-28 23:07:46 +01:00
Bob Weinand
47fd168fed Move missing zend_hash_* macros from phpdbg.h to zend_hash.h 2014-10-28 23:07:36 +01:00
Bob Weinand
a5415456d4 Merge phpdbg into PHP-5.6 2014-10-28 23:06:50 +01:00