Remi Collet
d42ae32738
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix possible null deref (detected by code coverity scan)
Remove trailing space in NEWS
NEWS for 514afd67
2013-05-02 09:38:38 +02:00
Remi Collet
be3f7ba4fb
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix possible null deref (detected by code coverity scan)
2013-05-02 09:38:12 +02:00
Remi Collet
ab117573cd
fix possible null deref (detected by code coverity scan)
2013-05-02 09:38:00 +02:00
Remi Collet
fbff4ccf27
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
2013-04-30 09:02:59 +02:00
Remi Collet
4a92ae3401
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm
...
the SCRIPT_FILENAME may contains the QUERY_STRING.
Ex : RewriteRule ^(.*)\.php$ fcgi://127.0.0.1:9000/$1.php [P]
From apache debug (build with -DFCGI_DUMP_ENV_VARS)
AH01062: sending env var 'SCRIPT_FILENAME' value 'proxy:fcgi://127.0.0.1:9000/var/www/html/info.php?foo'
AH01071: Got error 'Primary script unknown\n'
2013-04-30 08:55:18 +02:00
David Soria Parra
86685aefab
Revert "Fix conversion from unsigned char to char"
...
This reverts commit bc50ba4bf9
.
2013-04-29 02:27:11 +02:00
David Soria Parra
bc50ba4bf9
Fix conversion from unsigned char to char
2013-04-26 10:55:52 +02:00
Nuno Lopes
e769025791
leave a sane environment behind (even if empty) when exiting
...
some OS atexit() handlers call getenv()
2013-04-07 02:33:33 -04:00
Xinchen Hui
bed44e562e
missed part of the patch
2013-03-29 23:47:46 +08:00
Xinchen Hui
953f07503a
Fixed bug #64544 (Valgrind warnings after using putenv)
...
The frozen_envion is needed, since if an item in environ is updated
(like the test script HOME one), invalid free still shows up
2013-03-29 23:42:50 +08:00
Keyur Govande
b2a760fe45
Merge branch 'pull-request/313' into PHP-5.5
...
* pull-request/313:
Patch for Bug #64544 . The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
2013-03-29 14:42:16 +00:00
Keyur Govande
5bf6323e51
Patch for Bug #64544 .
...
The process title change module keeps track of the locally allocated
environ, so it doesn't need to worry about when environ changes
underneath it, for example by putenv()/setenv()
2013-03-29 14:27:36 +00:00
Nikita Popov
92aa361bfc
Forgot to fix the test on 5.4
2013-03-28 18:42:01 +01:00
Nikita Popov
b1a6a17039
Fix Bug #64545 : PHP Error in ef93a93ee2
...
Test was using die "Foo" instead of die("Foo").
2013-03-28 18:23:23 +01:00
Xinchen Hui
127c78cb76
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 23:23:07 +08:00
Xinchen Hui
ef93a93ee2
Attempt to fix SKIP
2013-03-28 23:22:20 +08:00
Xinchen Hui
7dd661d0cd
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 14:35:02 +08:00
Xinchen Hui
ab089611e0
Fix test on Mac (\D shows up)
2013-03-28 14:34:08 +08:00
Xinchen Hui
ae71c1d9aa
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 13:54:37 +08:00
Xinchen Hui
467cd6a60f
Add test for #64529
2013-03-28 13:45:42 +08:00
Johannes Schlüter
d900382814
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-24 17:33:17 +01:00
Johannes Schlüter
6f560b0487
Document embedded server options in manpage
2013-03-24 17:32:30 +01:00
Johannes Schlüter
de71f435d8
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-24 17:32:00 +01:00
Johannes Schlüter
66682f5abe
It's 2013, even for a manpage
2013-03-24 17:31:29 +01:00
Pierre Joye
0179284bfb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- add reminder for checking return values
2013-03-24 13:29:16 +01:00
Pierre Joye
bb18fa448c
- add reminder for checking return values
2013-03-24 13:27:00 +01:00
Anatol Belski
ec26141f92
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 22:43:58 +01:00
Pierre Joye
3af4896837
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
...
Signed-off-by: Anatol Belski <ab@php.net>
2013-03-23 22:42:03 +01:00
Keyur Govande
a0a995cff3
Support for CLI process title ( https://wiki.php.net/rfc/cli_process_title )
...
A new commit into branch 5.5
2013-03-07 18:54:34 +00:00
Stanislav Malyshev
c877fcf6ec
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added HTTP codes as of RFC 6585
2013-02-17 01:20:14 -08:00
Jonh Wendell
59b016192d
Added HTTP codes as of RFC 6585
...
Added descriptions for the new HTTP codes:
- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
2013-02-17 01:18:40 -08:00
Remi Collet
5d3501c7d4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64128 buit-in web server is broken on ppc64.
2013-02-01 19:26:11 +01:00
Remi Collet
0cea9e6843
Fixed bug #64128 buit-in web server is broken on ppc64.
...
fdset management using bit operator is broken on non-x86 arch
and cause built-in server the enter an infinite loop of "select"
and never handle any request.
2013-02-01 19:23:25 +01:00
Adam Harvey
77010bf9bf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
2013-01-16 10:19:13 +08:00
Adam Harvey
142c40f32c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
2013-01-16 10:18:00 +08:00
Adam Harvey
f63a9f6c11
Update the arguments in the prototype of fpm_socket_unix_test_connect().
...
Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11).
2013-01-16 10:06:56 +08:00
Lars Strojny
785e66adb5
PR #260 : Update css for 404 pages to feel more up to date and have a consistent layout across browsers
2013-01-14 20:43:14 +01:00
George Wang
9c52d09ebc
sapi/litespeed/lsapi_main.c: Fix bug #63228
...
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
2013-01-08 11:40:13 +08:00
Stanislav Malyshev
80a9a80a52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
fix NEWS
Conflicts:
main/main.c
2013-01-01 21:20:35 -08:00
Stanislav Malyshev
36e19c9cab
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
...
Without this fix, a webpage using eval() may return code 500. That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
2013-01-01 21:18:59 -08:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
Lars Strojny
aaa5e42177
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-14 14:56:25 +01:00
pascalc
d813af0618
update test for supported Mime Types checking
2012-12-14 13:59:06 +01:00
pascalc
e5b1ebc082
update list of common Mime Types in PHP development server to support Web audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together
2012-12-14 13:59:01 +01:00
Remi Collet
bc7f2b5f41
Merge branch 'PHP-5.3' into PHP-5.5
...
* PHP-5.3:
Fixed Bug #63581 Possible buffer overflow
Fixed Bug #63581 Possible null dereference
2012-11-28 10:38:37 +01:00
Remi Collet
487b7c7f32
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed Bug #63581 Possible buffer overflow
Fixed Bug #63581 Possible null dereference
2012-11-28 10:38:13 +01:00
Remi Collet
bc492007da
Fixed Bug #63581 Possible buffer overflow
...
In fpm-log, possible buffer overflow. Check for length is done at
the beginning of the loop, so is not done when overflow occurs
on the last loop (len = 1024 or 1025). (ack from fat).
This issue where found from by static code analysis tool and, so,
I can't provide any reproducer.
2012-11-28 10:35:04 +01:00
Remi Collet
f08060a48f
Fixed Bug #63581 Possible null dereference
...
Possible NULL dereference when trying to delete the single item
of a list (ack from fat).
This issues where found from by static code analysis tool and,
so, I can't provide any reproducer.
2012-11-28 10:28:18 +01:00