diff options
Diffstat (limited to 'sapi/fpm')
| -rw-r--r-- | sapi/fpm/Makefile.frag | 2 | ||||
| -rw-r--r-- | sapi/fpm/php-fpm.8.in | 16 | ||||
| -rw-r--r-- | sapi/fpm/status.html.in | 24 | ||||
| -rw-r--r-- | sapi/fpm/tests/fcgi.inc | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag index b4c08b4fa5..c6a290f9d5 100644 --- a/sapi/fpm/Makefile.frag +++ b/sapi/fpm/Makefile.frag @@ -18,7 +18,7 @@ install-fpm: $(SAPI_FPM_PATH) $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ fi - + @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8 diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in index 4497e6e61c..86edaa894f 100644 --- a/sapi/fpm/php-fpm.8.in +++ b/sapi/fpm/php-fpm.8.in @@ -7,7 +7,7 @@ php-fpm \- PHP FastCGI Process Manager 'PHP-FPM' [options] .LP .SH DESCRIPTION -\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for +\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for Web development and can be embedded into HTML. This is a variant of PHP that will run in the background as a daemon, listening for CGI requests. Output is logged to @php_fpm_localstatedir@/log/php-fpm.log. .LP Most options are set in the configuration file. The configuration file is @php_fpm_sysconfdir@/php-fpm.conf. By default, php-fpm will respond to CGI requests listening on localhost http port 9000. Therefore php-fpm expects your webserver to forward all requests for '.php' files to port 9000 and you should edit your webserver configuration file appropriately. @@ -21,8 +21,8 @@ Do not chdir to the script's directory .TP .PD 1 .B \-c \fIpath\fP|\fIfile\fP -Look for -.B php.ini +Look for +.B php.ini file in the directory .IR path or use the specified @@ -33,8 +33,8 @@ or use the specified .TP .PD 1 .B \-n -No -.B php.ini +No +.B php.ini file will be used .TP .PD 0 @@ -42,8 +42,8 @@ file will be used .TP .PD 1 .B \-d \fIfoo\fP[=\fIbar\fP] -Define INI entry -.IR foo +Define INI entry +.IR foo with value .IR bar .TP @@ -208,7 +208,7 @@ A List of active developers can be found here: .B http://www.php.net/credits.php .PD 1 .P -And last but not least PHP was developed with the help of a huge amount of +And last but not least PHP was developed with the help of a huge amount of contributors all around the world. .SH VERSION INFORMATION This manpage describes \fBphp-fpm\fP, version @PHP_VERSION@. diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in index 7b5aedc425..863fcf3b54 100644 --- a/sapi/fpm/status.html.in +++ b/sapi/fpm/status.html.in @@ -5,9 +5,9 @@ The PHP License, version 3.01 This is sample real-time status page for FPM. You can change it to better fit your needs. --> - <head> + <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - <style type="text/css"> + <style type="text/css"> body {background-color: #ffffff; color: #000000;} body, td, th, h1, h2 {font-family: sans-serif;} pre {margin: 0px; font-family: monospace;} @@ -32,40 +32,40 @@ } img {float: right; border: 0px;} hr {width: 600px; background-color: #cccccc; border: 0px; height: 1px; color: #000000;} - </style> + </style> <title>PHP-FPM status page</title> - <meta name="ROBOTS" content="NOINDEX,NOFOLLOW,NOARCHIVE" /></head> + <meta name="ROBOTS" content="NOINDEX,NOFOLLOW,NOARCHIVE" /></head> <body> <div class="center"> <table border="0" cellpadding="3" width="95%"> <tr class="h"> - <td> + <td> <a href="http://www.php.net/"><img border="0" src="https://static.php.net/www.php.net/images/php.gif" alt="PHP Logo" /></a><h1 class="p">PHP-FPM real-time status page</h1> </td> </tr> </table> <br /> <table border="0" cellpadding="3" width="95%"> - <tr><td class="e">Status URL</td><td class="v"><input type="text" id="url" size="45" /></td></tr> - <tr><td class="e">Ajax status</td><td class="v" id="status"></td></tr> - <tr><td class="e">Refresh Rate</td><td class="v"><input type="text" id="rate" value="1" /></td></tr> + <tr><td class="e">Status URL</td><td class="v"><input type="text" id="url" size="45" /></td></tr> + <tr><td class="e">Ajax status</td><td class="v" id="status"></td></tr> + <tr><td class="e">Refresh Rate</td><td class="v"><input type="text" id="rate" value="1" /></td></tr> <tr> <td class="e">Actions</td> <td class="v"> <button onclick="javascript:refresh();">Manual Refresh</button> <button id="play" onclick="javascript:playpause();">Play</button> </td> - </tr> + </tr> </table> - <h1>Pool Status</h1> + <h1>Pool Status</h1> <table border="0" cellpadding="3" width="95%" id="short"> <tr style="display: none;"><td> </td></tr> </table> - <h1>Active Processes status</h1> + <h1>Active Processes status</h1> <table border="0" cellpadding="3" width="95%" id="active"> <tr class="h"><th>PID↓</th><th>Start Time</th><th>Start Since</th><th>Requests Served</th><th>Request Duration</th><th>Request method</th><th>Request URI</th><th>Content Length</th><th>User</th><th>Script</th></tr> </table> - <h1>Idle Processes status</h1> + <h1>Idle Processes status</h1> <table border="0" cellpadding="3" width="95%" id="idle"> <tr class="h"><th>PID↓</th><th>Start Time</th><th>Start Since</th><th>Requests Served</th><th>Request Duration</th><th>Request method</th><th>Request URI</th><th>Content Length</th><th>User</th><th>Script</th><th>Last Request %CPU</th><th>Last Request Memory</th></tr> </table> diff --git a/sapi/fpm/tests/fcgi.inc b/sapi/fpm/tests/fcgi.inc index 71bdad17b9..07603a808e 100644 --- a/sapi/fpm/tests/fcgi.inc +++ b/sapi/fpm/tests/fcgi.inc @@ -603,7 +603,7 @@ class Client } if ($resp['type'] == self::END_REQUEST) { $this->_requests[$resp['requestId']]['state'] = self::REQ_STATE_OK; - if ($resp['requestId'] == $requestId) { + if ($resp['requestId'] == $requestId) { break; } } |