Dmitry Stogov
c746dcd7fd
Get rid of zend_free_op structure (use zval* instead).
...
Get rid of useless TSRMLS arguments.
2014-11-18 09:05:48 +03:00
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
Dmitry Stogov
76019b86c0
Reorder fields for most often access pattern
2014-11-17 14:06:50 +03:00
Remi Collet
269470e65e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update fpm configuration for #68428
update fpm configuration for #68428
fix incompatible pointer types
fix incompatible pointer types
2014-11-17 09:43:56 +01:00
Remi Collet
ab2215deb3
update fpm configuration for #68428
2014-11-17 09:43:51 +01:00
Remi Collet
c996a9899e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update fpm configuration for #68428
fix incompatible pointer types
2014-11-17 09:43:26 +01:00
Remi Collet
d9fd670fdc
update fpm configuration for #68428
2014-11-17 09:43:23 +01:00
Remi Collet
09f9f7ce50
update fpm configuration for #68428
2014-11-17 09:43:09 +01:00
Anatol Belski
317d7c62ee
fix incompatible pointer types
2014-11-17 09:34:20 +01:00
Anatol Belski
873a460c7c
fix incompatible pointer types
2014-11-17 09:33:58 +01:00
Anatol Belski
1504e9c9df
fix incompatible pointer types
2014-11-17 09:33:37 +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
82c71158c1
NEWS
2014-11-17 09:23:47 +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
6d9b4ca5fc
NEWS
2014-11-17 09:23:16 +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
Dmitry Stogov
54fa424751
Micro optimization
2014-11-17 08:36:14 +03: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
cac8e96738
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
2014-11-15 08:14:51 +01:00
Remi Collet
51acb9dddd
NEWS
2014-11-15 08:14:43 +01:00
Remi Collet
e52295988c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
2014-11-15 08:14:09 +01:00
Remi Collet
69b9381901
NEWS
2014-11-15 08:13:56 +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
Anatol Belski
82c2e3f201
fix build
...
ifdef this var declaration to avoid the vs warning
2014-11-14 22:19:41 +01:00
Remi Collet
4ae31bff12
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
2014-11-14 19:14:53 +01:00
Remi Collet
548352aa1e
NEWS
2014-11-14 19:14:42 +01:00
Remi Collet
546fb3407d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
2014-11-14 19:14:02 +01:00
Remi Collet
e4974f6cc6
NEWS
2014-11-14 19:13:53 +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
Anatol Belski
1ae7743a07
less spaces in the makefile generated commands
2014-11-14 17:39:43 +01:00
Anatol Belski
034a88135f
separate LDFLAGS and ARFLAGS to fix the unknown opts warns
2014-11-14 17:39:42 +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
b7eee5bfaf
added comment
2014-11-14 17:39:39 +01:00
Anatol Belski
8434a7f2ab
validate sockets portable way
2014-11-14 17:39:38 +01:00
Anatol Belski
e1d0ca7cae
fix unused var warning
2014-11-14 17:39:37 +01:00
Anatol Belski
3b4a6dc114
removed useless check
...
the offset member is an unsigned
2014-11-14 17:39:35 +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
