summaryrefslogtreecommitdiff
path: root/sapi/cli/php_http_parser.c
diff options
context:
space:
mode:
authorJakub Zelenka <bukka@php.net>2014-12-14 18:39:14 +0000
committerJakub Zelenka <bukka@php.net>2014-12-14 18:39:14 +0000
commitb9ad0002f5fc40f5808f85119a67012c2e9a4141 (patch)
tree5dc09ca330b2358670215ff9cdbf6f3bfdcbd6e4 /sapi/cli/php_http_parser.c
parent0bfa245aa3f3994d3095afd696bbd3f0130594ab (diff)
parent855d2966385755435b65d77e1c0dfda17555eab9 (diff)
downloadphp-git-b9ad0002f5fc40f5808f85119a67012c2e9a4141.tar.gz
Merge branch 'master' into jsond
Diffstat (limited to 'sapi/cli/php_http_parser.c')
-rw-r--r--sapi/cli/php_http_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/cli/php_http_parser.c b/sapi/cli/php_http_parser.c
index cc649af79a..31ae4167d1 100644
--- a/sapi/cli/php_http_parser.c
+++ b/sapi/cli/php_http_parser.c
@@ -1378,7 +1378,7 @@ size_t php_http_parser_execute (php_http_parser *parser,
/* Here we call the headers_complete callback. This is somewhat
* different than other callbacks because if the user returns 1, we
* will interpret that as saying that this message has no body. This
- * is needed for the annoying case of recieving a response to a HEAD
+ * is needed for the annoying case of receiving a response to a HEAD
* request.
*/
if (settings->on_headers_complete) {