diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:20:18 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:20:18 -0700 |
| commit | ac40c0b562b0f90652cadef83968d7305626c377 (patch) | |
| tree | 450cd9d7b67422adfae2218a69d21fb02f921474 /sapi/apache2handler | |
| parent | 04145dc2aa6eea37f7cd27ffa69ad3b2f52a65da (diff) | |
| download | php-git-ac40c0b562b0f90652cadef83968d7305626c377.tar.gz | |
Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
typofixes
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/README | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache2handler/README b/sapi/apache2handler/README index 5cbd1b95dd..4defa336c6 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 bcb2443112..b7f95e0c12 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. |