diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:31:57 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:31:57 -0700 |
| commit | 8ac131503ddeee5b1de8225510f9d2927e903620 (patch) | |
| tree | f02250a3e6cb8712adc02d23eb2e1b0f5dd3b3fd /sapi/apache_hooks/mod_php5.c | |
| parent | d7c943e2a1f54c445276fc77369918f33c4f6cce (diff) | |
| parent | 4427d1dcfdca5e5e4b7e1b1226cf4771cc82389f (diff) | |
| download | php-git-8ac131503ddeee5b1de8225510f9d2927e903620.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
Diffstat (limited to 'sapi/apache_hooks/mod_php5.c')
| -rw-r--r-- | sapi/apache_hooks/mod_php5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index dda6e49891..66adb482ed 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 * */ |