granicus.if.org Git

Remi Collet [Mon, 17 Nov 2014 05:59:03 +0000 (06:59 +0100)]

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

commit | commitdiff | tree

Remi Collet [Mon, 17 Nov 2014 05:58:28 +0000 (06:58 +0100)]

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

commit | commitdiff | tree

Remi Collet [Mon, 17 Nov 2014 05:57:59 +0000 (06:57 +0100)]

comment about ipv4-mapped in fpm conf

commit | commitdiff | tree

Remi Collet [Mon, 17 Nov 2014 05:53:38 +0000 (06:53 +0100)]

Improve fix bug #68421 access.format='%R' doesn't log ipv6 address

Log IPv4-Mapped-Ipv6 address as IPv4 (not as IPv6)

commit | commitdiff | tree

Dmitry Stogov [Mon, 17 Nov 2014 05:36:14 +0000 (08:36 +0300)]

commit | commitdiff | tree

Remi Collet [Sun, 16 Nov 2014 17:01:01 +0000 (18:01 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
improve comments about FPM listen option

commit | commitdiff | tree

Remi Collet [Sun, 16 Nov 2014 17:00:24 +0000 (18:00 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
improve comments about FPM listen option

commit | commitdiff | tree

Remi Collet [Sun, 16 Nov 2014 16:59:36 +0000 (17:59 +0100)]

improve comments about FPM listen option

commit | commitdiff | tree

Remi Collet [Sat, 15 Nov 2014 07:14:51 +0000 (08:14 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
NEWS
NEWS

commit | commitdiff | tree

Remi Collet [Sat, 15 Nov 2014 07:14:43 +0000 (08:14 +0100)]

commit | commitdiff | tree

Remi Collet [Sat, 15 Nov 2014 07:14:09 +0000 (08:14 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS

commit | commitdiff | tree

Remi Collet [Sat, 15 Nov 2014 07:13:56 +0000 (08:13 +0100)]

commit | commitdiff | tree

Remi Collet [Sat, 15 Nov 2014 07:12:07 +0000 (08:12 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses

commit | commitdiff | tree

Remi Collet [Sat, 15 Nov 2014 07:11:32 +0000 (08:11 +0100)]

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

commit | commitdiff | tree

Remi Collet [Sat, 15 Nov 2014 07:08:23 +0000 (08:08 +0100)]

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.

commit | commitdiff | tree

Anatol Belski [Fri, 14 Nov 2014 21:19:41 +0000 (22:19 +0100)]

fix build

ifdef this var declaration to avoid the vs warning

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 18:14:53 +0000 (19:14 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
NEWS
NEWS

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 18:14:42 +0000 (19:14 +0100)]

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 18:14:02 +0000 (19:14 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 18:13:53 +0000 (19:13 +0100)]

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 18:10:43 +0000 (19:10 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix bug #68421 access.format='%R' doesn't log ipv6 address

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 18:10:19 +0000 (19:10 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #68421 access.format='%R' doesn't log ipv6 address

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 18:09:50 +0000 (19:09 +0100)]

Fix bug #68421 access.format='%R' doesn't log ipv6 address

commit | commitdiff | tree

Anatol Belski [Fri, 14 Nov 2014 16:38:03 +0000 (17:38 +0100)]

less spaces in the makefile generated commands

commit | commitdiff | tree

Anatol Belski [Fri, 14 Nov 2014 12:57:57 +0000 (13:57 +0100)]

separate LDFLAGS and ARFLAGS to fix the unknown opts warns

commit | commitdiff | tree

Anatol Belski [Fri, 14 Nov 2014 10:27:23 +0000 (11:27 +0100)]

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.

commit | commitdiff | tree

Anatol Belski [Fri, 14 Nov 2014 09:31:35 +0000 (10:31 +0100)]

commit | commitdiff | tree

Anatol Belski [Fri, 14 Nov 2014 09:20:03 +0000 (10:20 +0100)]

commit | commitdiff | tree

Anatol Belski [Fri, 14 Nov 2014 09:17:43 +0000 (10:17 +0100)]

validate sockets portable way

commit | commitdiff | tree

Anatol Belski [Fri, 14 Nov 2014 09:05:53 +0000 (10:05 +0100)]

fix unused var warning

commit | commitdiff | tree

Anatol Belski [Fri, 14 Nov 2014 08:46:06 +0000 (09:46 +0100)]

removed useless check

the offset member is an unsigned

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 16:33:14 +0000 (17:33 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix bug #68423i PHP-FPM will no longer load all pools

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 16:32:46 +0000 (17:32 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #68423i PHP-FPM will no longer load all pools

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 16:29:31 +0000 (17:29 +0100)]

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));

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 09:59:04 +0000 (10:59 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
NEWS for 1b156207446e0c5ec8a9476ad0966b5daa82f516

commit | commitdiff | tree

Remi Collet [Fri, 14 Nov 2014 09:58:27 +0000 (10:58 +0100)]

NEWS for 1b156207446e0c5ec8a9476ad0966b5daa82f516

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 15:00:00 +0000 (16:00 +0100)]

avoid repeated strlen usage, remove unused vars

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 14:45:28 +0000 (15:45 +0100)]

fix datatype mismatch

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 14:27:53 +0000 (15:27 +0100)]

fix datatype mismatch

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 13:29:21 +0000 (14:29 +0100)]

extend warn list to exclude

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 13:27:38 +0000 (14:27 +0100)]

fix datatype mismatch and kick unused var

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 13:17:41 +0000 (14:17 +0100)]

fix datatype mismatches, remove dead part of code

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 11:34:10 +0000 (12:34 +0100)]

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 11:31:29 +0000 (12:31 +0100)]

added missing type specifier

commit | commitdiff | tree

Dmitry Stogov [Thu, 13 Nov 2014 14:36:08 +0000 (17:36 +0300)]

commit | commitdiff | tree

Remi Collet [Thu, 13 Nov 2014 12:09:44 +0000 (13:09 +0100)]

commit | commitdiff | tree

Remi Collet [Thu, 13 Nov 2014 12:08:00 +0000 (13:08 +0100)]

Fix build with gmp < 4.2

See 3d6d863ccbd10d212352462b587ae1573af4f1d1
and acd7fcf55f81955e4837c750a5e45f83d3c55ba2

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 10:43:01 +0000 (11:43 +0100)]

add a configure option to suppress uncritical warns with clang

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 10:20:09 +0000 (11:20 +0100)]

pass vc++ version to clang, that will be forwarded to _MSC_VER

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 09:47:57 +0000 (10:47 +0100)]

HAVE_STRNLEN should be in all toolsets

commit | commitdiff | tree

Anatol Belski [Thu, 13 Nov 2014 07:17:39 +0000 (08:17 +0100)]

set the vc++ next name

commit | commitdiff | tree

Xinchen Hui [Thu, 13 Nov 2014 06:23:25 +0000 (14:23 +0800)]

Another fix for test fail

commit | commitdiff | tree

Xinchen Hui [Thu, 13 Nov 2014 06:16:08 +0000 (14:16 +0800)]

Revert "Fixed test fails (prop read always has a IS_STRING member now)"

This reverts commit 39913c4cdf54f926d733bfe0a95be2ecfa6bff35.

commit | commitdiff | tree

Xinchen Hui [Thu, 13 Nov 2014 04:54:17 +0000 (12:54 +0800)]

Merge branch 'master' of https://git.php.net/repository/php-src

commit | commitdiff | tree

Xinchen Hui [Thu, 13 Nov 2014 04:20:16 +0000 (12:20 +0800)]

Fixed test fails (prop read always has a IS_STRING member now)

commit | commitdiff | tree

Anatol Belski [Wed, 12 Nov 2014 18:06:09 +0000 (19:06 +0100)]

pre create the build dir

otherwise response file generation might fail

commit | commitdiff | tree

Anatol Belski [Wed, 12 Nov 2014 17:05:24 +0000 (18:05 +0100)]

fix test cleanup

this could leave garbage after it as the test file is removed in
flush (the fd could still be opened)

commit | commitdiff | tree

Anatol Belski [Wed, 12 Nov 2014 16:56:47 +0000 (17:56 +0100)]

commit | commitdiff | tree

Anatol Belski [Wed, 12 Nov 2014 16:30:52 +0000 (17:30 +0100)]

commit | commitdiff | tree

Anatol Belski [Wed, 12 Nov 2014 16:23:06 +0000 (17:23 +0100)]

trim when adding flags, avoid multiple spaces

commit | commitdiff | tree

Anatol Belski [Wed, 12 Nov 2014 16:16:09 +0000 (17:16 +0100)]

use response files for exts and sapi linking

commit | commitdiff | tree

Anatol Belski [Wed, 12 Nov 2014 16:05:01 +0000 (17:05 +0100)]

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.

commit | commitdiff | tree

Anatol Belski [Wed, 12 Nov 2014 10:14:56 +0000 (11:14 +0100)]

generalize arch setup

commit | commitdiff | tree

Anatol Belski [Wed, 12 Nov 2014 10:00:35 +0000 (11:00 +0100)]

fix int to void* cast on x64

commit | commitdiff | tree

Matteo Beccati [Wed, 12 Nov 2014 15:54:33 +0000 (16:54 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed NEWS

commit | commitdiff | tree

Matteo Beccati [Wed, 12 Nov 2014 15:54:03 +0000 (16:54 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed NEWS

commit | commitdiff | tree

Matteo Beccati [Wed, 12 Nov 2014 15:45:36 +0000 (16:45 +0100)]

Fixed NEWS

Some entries had been mistakenly removed in ad468d20b130c720020139b8d5f6601f6f3033ab

commit | commitdiff | tree

Ferenc Kovacs [Wed, 12 Nov 2014 13:51:39 +0000 (14:51 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
update NEWS

commit | commitdiff | tree

Ferenc Kovacs [Wed, 12 Nov 2014 13:51:18 +0000 (14:51 +0100)]

commit | commitdiff | tree

Ferenc Kovacs [Wed, 12 Nov 2014 13:46:07 +0000 (14:46 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
update NEWS

commit | commitdiff | tree

Ferenc Kovacs [Wed, 12 Nov 2014 13:45:39 +0000 (14:45 +0100)]

commit | commitdiff | tree

Ferenc Kovacs [Wed, 12 Nov 2014 13:29:11 +0000 (14:29 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
update NEWS

commit | commitdiff | tree

Ferenc Kovacs [Wed, 12 Nov 2014 13:28:45 +0000 (14:28 +0100)]

commit | commitdiff | tree

Matteo Beccati [Wed, 12 Nov 2014 10:23:24 +0000 (11:23 +0100)]

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

commit | commitdiff | tree

Matteo Beccati [Wed, 12 Nov 2014 10:21:40 +0000 (11:21 +0100)]

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

commit | commitdiff | tree

Matteo Beccati [Wed, 12 Nov 2014 10:21:11 +0000 (11:21 +0100)]

Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64

commit | commitdiff | tree

Julien Pauli [Wed, 12 Nov 2014 09:59:54 +0000 (10:59 +0100)]

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 12 Nov 2014 04:40:27 +0000 (13:40 +0900)]

Remove unneeded md5 hashing from PHP-5.6 branch.
It's removed from master already by my previous commit.

commit | commitdiff | tree

Stanislav Malyshev [Wed, 12 Nov 2014 00:35:41 +0000 (16:35 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix loop - size_t is unsigned so can not be negative
fix copypaste error

Conflicts:
ext/standard/html.c

commit | commitdiff | tree

Stanislav Malyshev [Wed, 5 Nov 2014 05:58:44 +0000 (21:58 -0800)]

fix loop - size_t is unsigned so can not be negative

commit | commitdiff | tree

Stanislav Malyshev [Wed, 5 Nov 2014 05:58:44 +0000 (21:58 -0800)]

fix loop - size_t is unsigned so can not be negative

commit | commitdiff | tree

Stanislav Malyshev [Wed, 5 Nov 2014 05:48:44 +0000 (21:48 -0800)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 12 Nov 2014 00:32:38 +0000 (16:32 -0800)]

Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
5.4.36-dev
Fixed bug #66584 Segmentation fault on statement deallocation

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 12 Nov 2014 00:31:38 +0000 (16:31 -0800)]

commit | commitdiff | tree

Matteo Beccati [Sat, 1 Nov 2014 18:11:43 +0000 (19:11 +0100)]

Fixed bug #66584 Segmentation fault on statement deallocation

commit | commitdiff | tree

Ferenc Kovacs [Tue, 11 Nov 2014 23:25:34 +0000 (00:25 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
update NEWS

commit | commitdiff | tree

Ferenc Kovacs [Tue, 11 Nov 2014 23:25:16 +0000 (00:25 +0100)]

commit | commitdiff | tree

Ferenc Kovacs [Tue, 11 Nov 2014 23:21:16 +0000 (00:21 +0100)]