clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-28 05:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,230 Commits 494 Branches 1,367 Tags 784 MiB
5ff9089aeb
Commit Graph

3060 Commits

Author SHA1 Message Date
Adam Harvey
77c46ba516 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
  Change the search in get_status_string() to correctly handle unknown codes.
 2013-06-20 09:39:37 -07:00
Adam Harvey
f5c7fe9202 Fix the spelling of the php_cli_server_http_response_status_code_pair typedef. 
Specifically: php_cli_server_http_reponse_status_code_pair →
php_cli_server_http_response_status_code_pair.
 2013-06-20 09:34:21 -07:00
Adam Harvey
283f56af66 Change the search in get_status_string() to correctly handle unknown codes. 
This previously used a buggy implementation of binary search that would loop
infinitely for unknown codes when searching in reason arrays of particular
sizes (such as the one we have at the moment). Since C provides bsearch(),
we'll just use that instead, since libc authors hopefully get this right.

There was also an additional bug that was masked by the first one: the design
was that an unknown code would result in get_status_string() returning NULL,
which would then result in a segfault in append_http_status_line(), since it
assumed that it would always receive a valid string pointer that could be
handed off to smart_str_appends_ex(). We'll now return a placeholder in that
case.

Fixes bug #65066 (Cli server not responsive when responding with 422 http
status code).
 2013-06-20 09:31:57 -07:00
Stanislav Malyshev
a770ae36c2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64764: Add status option to fpm init.d script
 2013-06-16 16:56:29 -07:00
Lior Kaplan
ee01af7df1 Fix bug #64764: Add status option to fpm init.d script 2013-06-16 16:54:49 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Stanislav Malyshev
84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Veres Lajos
ed2e84e239 typo fixes (accommodate, parameter) 2013-06-10 13:36:03 -07:00
Remi Collet
433731d463 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #64915 (error_log ignored when daemonize=0)
 2013-05-24 12:10:39 +02:00
Remi Collet
9f6ca9bc64 Fixed Bug #64915 (error_log ignored when daemonize=0) 
Use configured error_log file when stderr is not a tty.
So only use tty during interactive debug run.
 2013-05-24 12:09:05 +02:00
Remi Collet
c79f162c37 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.
 2013-05-21 09:53:51 +02:00
Remi Collet
0e99329e0a Add --with-fpm-systemd option to report health to systemd, and 
systemd_interval option to configure this. The service can now use
Type=notify in the systemd unit file.

Systemd status line will looks like:
Status: "Processes active: 0, idle: 5, Requests: 90, slow: 0, Traffic: 10req/sec"

Watchdog mode is also supported. In this case watchdog interval,
configured in the unit file, override the systemd_interval option.

When not used (default), no change from previous version.
 2013-05-21 09:49:00 +02:00
Remi Collet
c9085837a9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  From code coverity scan, syscall return value must be check.
 2013-05-03 08:23:07 +02:00
Remi Collet
3fd4b6be63 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  From code coverity scan, syscall return value must be check.
 2013-05-03 08:22:55 +02:00
Remi Collet
0549e55d82 From code coverity scan, syscall return value must be check. 
To not alter current behaviour, we simply log the problem,
so, if it occurs, the message will give explanation.

This are only warning as they don't block the server,
but such fail can explain strange (not expected) behaviour later.
 2013-05-03 08:19:14 +02:00
Remi Collet
6494faa844 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix more resource leaks
 2013-05-02 13:47:48 +02:00
Remi Collet
b7b150b830 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix more resource leaks
 2013-05-02 13:47:36 +02:00
Remi Collet
444e59eb20 fix more resource leaks 2013-05-02 13:47:24 +02:00
Remi Collet
a3e177b9fd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
 2013-05-02 13:31:22 +02:00
Remi Collet
08b72ac9f1 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
 2013-05-02 13:31:11 +02:00
Remi Collet
331540d20c From code coverity scan 
- fix some memory leak
- fix some resources leak (fd)
- create fpm_worker_pool_free (shared use)
- possible null dref (wp->user and wp->home can be null)
 2013-05-02 13:27:16 +02:00
Remi Collet
eb53035a80 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed size array cannot be null
 2013-05-02 10:33:05 +02:00
Remi Collet
c374b80dda Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fixed size array cannot be null
 2013-05-02 10:32:54 +02:00
Remi Collet
d0c40220d1 fixed size array cannot be null 2013-05-02 10:32:45 +02:00
Remi Collet
2f12769db0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
 2013-05-02 10:15:49 +02:00
Remi Collet
78c48af2f2 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
 2013-05-02 10:15:20 +02:00
Remi Collet
8492bbefbb use limit_extensions as we use security_limit_extensions later (free) 2013-05-02 10:15:12 +02:00
Remi Collet
a7d6cb2360 unused variable 2013-05-02 10:15:05 +02:00
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
Karsten Schmidt
3fd5a40556 Dont reset other counters when incrementing slow_rq 2013-02-20 18:53:17 +01: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
Anatoliy Belsky
01f1894194 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test sapi/cli/tests/006.phpt
 2012-11-14 16:23:36 +01:00
Anatoliy Belsky
3d82f16c7d Fixed test sapi/cli/tests/006.phpt 
Third param in preg_match_all() is optional for a while )
 2012-11-14 16:20:59 +01:00
Anatoliy Belsky
64d7297506 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enabled apache 2.4 handler build option
 2012-11-13 19:48:34 +01:00
Anatoliy Belsky
117d2dd688 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Enabled apache 2.4 handler build option

Conflicts:
	sapi/apache2handler/config.w32
 2012-11-13 19:40:22 +01:00
Pierre Joye
019bdff395 Enabled apache 2.4 handler build option 2012-11-13 19:34:00 +01:00
Xinchen Hui
7e2c87bf2b Add missed file 2012-10-24 10:34:44 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
ea441bd08d Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css) 2012-10-10 17:23:30 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
George Wang
1407b4a080 Merge branch '5.4' 
* 5.4:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
 2012-10-12 13:29:37 -04:00
George Wang
68e528a6bc Merge branch '5.3' into 5.4 
* 5.3:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
 2012-10-12 13:09:53 -04:00
George Wang
22611b8d37 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]
 2012-10-12 13:04:22 -04:00
Xinchen Hui
7a7b2a0642 Merge branch 'PHP-5.4' 2012-10-10 17:24:40 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Jerome Loyet
284ea56d4d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add missing NEWS entry
  Fixed bug #62216
 2012-09-28 11:22:59 +02:00
Jerome Loyet
b530f53c67 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62216
 2012-09-28 11:21:12 +02:00
Jerome Loyet
bb02fd5772 Fixed bug #62216 
Add PID to php-fpm init.d script
 2012-09-28 11:18:08 +02:00
Jerome Loyet
68eb608f3c - Fixed bug #62887 (Only /status?plain&full gives "last request cpu") 2012-09-28 01:26:20 +02:00
Jerome Loyet
9ef925b351 - Fixed bug #62887 (Only /status?plain&full gives "last request cpu") 2012-09-28 01:25:51 +02:00
Jerome Loyet
151b16cf7f - Fixed bug #62887 (Only /status?plain&full gives "last request cpu") 2012-09-28 01:24:52 +02:00
Jerome Loyet
be043ab6d0 Merge branch 'fuckgit' into PHP-5.4 
* fuckgit:
  - Fixed bug #62947 (Unneccesary warnings on FPM)
  - Fixed bug #63085 (Systemd integration and daemonize)

Conflicts:
	sapi/fpm/config.m4
 2012-09-28 01:19:01 +02:00
Jerome Loyet
9ed421e3d7 - Fixed bug #62947 (Unneccesary warnings on FPM) 2012-09-28 01:09:31 +02:00
Jerome Loyet
72f3457161 - Fixed bug #62947 (Unneccesary warnings on FPM) 2012-09-28 01:08:48 +02:00
Jerome Loyet
e31553c204 - Fixed bug #62947 (Unneccesary warnings on FPM) 2012-09-28 01:08:08 +02:00
Jerome Loyet
c8b7ea0f57 - fix merge (fucking git merging system ... :( ) 2012-09-28 00:55:06 +02:00
Jerome Loyet
9e4c0b8142 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #63085 (Systemd integration and daemonize)
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
 2012-09-28 00:53:43 +02:00
Jerome Loyet
64a0e7cdc2 - Fixed bug #63085 (Systemd integration and daemonize) 2012-09-28 00:53:05 +02:00
Jerome Loyet
2259a8f18b - add missing php-fpm.service.in 2012-09-28 00:47:56 +02:00
Jerome Loyet
b2f4e686f0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #63085 (Systemd integration and daemonize)
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)

Conflicts:
	sapi/fpm/config.m4
 2012-09-28 00:39:29 +02:00
Jerome Loyet
851a04bb7b - Fixed bug #63085 (Systemd integration and daemonize) 2012-09-28 00:33:05 +02:00
Jerome Loyet
ace1bf9740 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
 2012-09-28 00:08:13 +02:00
Jerome Loyet
b5eb1456aa - Fixed bug #62954 (startup problems fpm / php-fpm) 
- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
 2012-09-28 00:05:48 +02:00
Jerome Loyet
75c63c5503 - Fixed bug #62954 (startup problems fpm / php-fpm) 
- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
 2012-09-27 23:54:35 +02:00
Lars Strojny
d0e96a5575 Merge branch 'PHP-5.4' 2012-09-18 22:17:36 +02:00
Lars Strojny
aa133ea282 Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver 2012-09-18 22:16:51 +02:00
Stanislav Malyshev
6cc9d99dc2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Respond with 501 to unknown request methods
 2012-09-15 23:11:55 -07:00
Niklas Lindgren
27542db4e7 Respond with 501 to unknown request methods 
Fixed typo

Moved 501 response from dispatch to event_read_request

Return return value of send_error_page
 2012-09-15 23:11:12 -07:00
Xinchen Hui
63d9c1f40b Merge branch 'PHP-5.4' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Lars Strojny
e7a714b35e Merging PR 121 to add support for slow request counting on the PHP-FPM status page 2012-08-26 17:09:46 +02:00
Lars Strojny
8e7081f3ac Merging PR 121 to add support for slow request counting on the PHP-FPM status page 2012-08-26 17:02:39 +02:00
Xinchen Hui
75cf51de50 Merge branch 'PHP-5.4' 2012-08-18 12:22:47 +08:00
Xinchen Hui
ebefbdb76d Fix test failed 2012-08-18 12:21:48 +08:00
Felipe Pena
f84947c688 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
 2012-08-16 15:45:40 -03:00
Felipe Pena
2e1d31d123 - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set) 2012-08-16 15:45:21 -03:00
Stanislav Malyshev
c9eb64127e Merge branch 'pull-request/132' 
* pull-request/132:
  OK, bye bye JavaScript, let's just include credits before license
  Nicer (JSLint-compliant!) credits reveal JavaScript
  Removed now-unnecessary expose_php checks for logo
  Fixed small misalignment in prev commit
  Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
 2012-08-05 21:15:53 -07:00
Xinchen Hui
7e4c0125da Merge branch 'PHP-5.4' 2012-08-02 23:05:09 +08:00
Xinchen Hui
d1f0662e4d Fixed bug #62725 (Calling exit() in a shutdown function does not return the exit value) 
The fix is make 5.4 behavior consistent with 5.3
 2012-08-02 23:03:38 +08:00
Xinchen Hui
7e37860246 Merge branch 'PHP-5.4' 2012-08-01 23:56:44 +08:00
Xinchen Hui
36100060b3 Sleep a little bit more, in some slow machine (like gcov), it will take a little more time to setup server 2012-08-01 23:54:01 +08:00
Xinchen Hui
38c38e677e Merge branch 'PHP-5.4' 2012-07-31 22:43:10 +08:00
Xinchen Hui
0988ae3c43 Implemented FR #62700 (have the console output 'Listening on http://localhost:8000') 2012-07-31 22:42:28 +08:00
Rasmus Lerdorf
5799ebdb0c Fix bug #62654 2012-07-25 02:03:47 +02:00
Rasmus Lerdorf
0fbc8561e6 Fix bug #62654 2012-07-24 16:40:50 -07:00
Rasmus Lerdorf
5f224412fa Fix bug #62654 2012-07-24 16:28:49 -07:00
Johannes Schlüter
f43e4f9883 Merge branch 'PHP-5.4' 2012-07-22 23:30:06 +02:00
Johannes Schlüter
860b3ffe75 Fix Bug #62612 readline extension compilation fails 2012-07-22 23:28:32 +02:00
Xinchen Hui
f89dbe5dea Merge branch 'PHP-5.4' 
* PHP-5.4:
  Improve error message for ssl request
 2012-07-22 19:25:54 +08:00
Xinchen Hui
a88eca53f7 Improve error message for ssl request 2012-07-22 19:20:23 +08:00
Xinchen Hui
401230c7e1 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test (no charset outputed)
 2012-07-18 19:50:59 +08:00
Xinchen Hui
8f89cfb548 Fix test (no charset outputed) 2012-07-18 19:50:30 +08:00
Andrew Faulds
d12f8d6790 Removed Logo GUIDs and replaced with Data URIs and div hidden with JS 
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
 2012-07-14 21:44:21 +01:00
Felipe Pena
a76878cd59 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)
 2012-07-08 14:05:42 -03:00
Felipe Pena
2019062cfc - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds) 2012-07-08 14:05:28 -03:00
Johannes Schlüter
cde8e0a281 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix memleak in CLI
 2012-06-27 11:48:05 +02:00
Johannes Schlüter
9a86784859 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix memleak in CLI

Conflicts:
	sapi/cli/php_cli.c
 2012-06-27 11:46:57 +02:00
Johannes Schlüter
bc0972e78d Fix memleak in CLI 2012-06-27 11:42:43 +02:00
Xinchen Hui
df20808818 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix potential leak in cli server
 2012-06-16 14:30:21 +08:00