diff options
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache/mod_php5.c | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/README | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/README | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 | ||||
| -rw-r--r-- | sapi/apache_hooks/mod_php5.c | 2 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 2 | ||||
| -rw-r--r-- | sapi/fpm/init.d.php-fpm.in | 16 | ||||
| -rw-r--r-- | sapi/fpm/php-fpm.conf.in | 2 | ||||
| -rw-r--r-- | sapi/isapi/stresstest/stresstest.cpp | 2 | ||||
| -rw-r--r-- | sapi/thttpd/thttpd.c | 2 |
10 files changed, 24 insertions, 10 deletions
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 11be0ed22..8361f7f41 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -130,7 +130,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC) /* * This handles the situation where the browser sends a Expect: 100-continue header - * and needs to recieve confirmation from the server on whether or not it can send + * and needs to receive confirmation from the server on whether or not it can send * the rest of the request. RFC 2616 * */ diff --git a/sapi/apache2filter/README b/sapi/apache2filter/README index 3054e208d..bd6eb1706 100644 --- a/sapi/apache2filter/README +++ b/sapi/apache2filter/README @@ -54,7 +54,7 @@ HOW TO CONFIGURE DEBUGGING APACHE AND PHP - To debug Apache, we recommened: + To debug Apache, we recommend: 1. Use the Prefork MPM (Apache 1.3-like process model) by configuring Apache with '--with-mpm=prefork'. diff --git a/sapi/apache2handler/README b/sapi/apache2handler/README index 5cbd1b95d..4defa336c 100644 --- a/sapi/apache2handler/README +++ b/sapi/apache2handler/README @@ -58,7 +58,7 @@ HOW TO CONFIGURE DEBUGGING APACHE AND PHP - To debug Apache, we recommened: + To debug Apache, we recommend: 1. Use the Prefork MPM (Apache 1.3-like process model) by configuring Apache with '--with-mpm=prefork'. diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index bcb244311..b7f95e0c1 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -632,7 +632,7 @@ zend_first_try { } /* - * check if comming due to ErrorDocument + * check if coming due to ErrorDocument * We make a special exception of 413 (Invalid POST request) as the invalidity of the request occurs * during processing of the request by PHP during POST processing. Therefor we need to re-use the exiting * PHP instance to handle the request rather then creating a new one. diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index dda6e4989..66adb482e 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -275,7 +275,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC) /* * This handles the situation where the browser sends a Expect: 100-continue header - * and needs to recieve confirmation from the server on whether or not it can send + * and needs to receive confirmation from the server on whether or not it can send * the rest of the request. RFC 2616 * */ diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index d85df188b..cd5fc34d0 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -697,7 +697,7 @@ static int fpm_evaluate_full_path(char **path, struct fpm_worker_pool_s *wp, cha if (tmp != NULL) { if (tmp != *path) { - zlog(ZLOG_ERROR, "'$prefix' must be use at the begining of the value"); + zlog(ZLOG_ERROR, "'$prefix' must be use at the beginning of the value"); return -1; } diff --git a/sapi/fpm/init.d.php-fpm.in b/sapi/fpm/init.d.php-fpm.in index 49cce79ae..020b942f1 100644 --- a/sapi/fpm/init.d.php-fpm.in +++ b/sapi/fpm/init.d.php-fpm.in @@ -91,6 +91,20 @@ case "$1" in fi ;; + status) + if [ ! -r $php_fpm_PID ] ; then + echo "php-fpm is stopped" + exit 0 + fi + + PID=`cat $php_fpm_PID` + if ps -p $PID | grep -q $PID; then + echo "php-fpm (pid $PID) is running..." + else + echo "php-fpm dead but pid file exists" + fi + ;; + force-quit) echo -n "Terminating php-fpm " @@ -131,7 +145,7 @@ case "$1" in ;; *) - echo "Usage: $0 {start|stop|force-quit|restart|reload}" + echo "Usage: $0 {start|stop|force-quit|restart|reload|status}" exit 1 ;; diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in index f4d6e06c3..e0d80970a 100644 --- a/sapi/fpm/php-fpm.conf.in +++ b/sapi/fpm/php-fpm.conf.in @@ -10,7 +10,7 @@ ; files from a glob(3) pattern. This directive can be used everywhere in the ; file. ; Relative path can also be used. They will be prefixed by: -; - the global prefix if it's been set (-p arguement) +; - the global prefix if it's been set (-p argument) ; - @prefix@ otherwise ;include=etc/fpm.d/*.conf diff --git a/sapi/isapi/stresstest/stresstest.cpp b/sapi/isapi/stresstest/stresstest.cpp index 97824e6be..9a5964a6b 100644 --- a/sapi/isapi/stresstest/stresstest.cpp +++ b/sapi/isapi/stresstest/stresstest.cpp @@ -796,7 +796,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest, switch(dwHSERequest) { case (HSE_REQ_SEND_RESPONSE_HEADER) : - lpszRespBuf = (char *)xmalloc(*lpdwSize);//+ 80);//accomodate our header + lpszRespBuf = (char *)xmalloc(*lpdwSize);//+ 80);//accommodate our header if (!lpszRespBuf) return FALSE; wsprintf(lpszRespBuf,"%s", diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c index 1a1baa707..548bcda17 100644 --- a/sapi/thttpd/thttpd.c +++ b/sapi/thttpd/thttpd.c @@ -579,7 +579,7 @@ static void queue_request(httpd_conn *hc) m->next = NULL; tsrm_mutex_lock(qr_lock); - /* Create new threads when reaching a certain threshhold */ + /* Create new threads when reaching a certain threshold */ if (nr_threads < max_threads && nr_free_threads < 2) { nr_threads++; /* protected by qr_lock */ |