diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-04-13 01:57:15 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-04-13 01:57:15 +0200 |
| commit | 51cbb85ea9ef758b75bf718985f634b83eb57b34 (patch) | |
| tree | b047f2debffa5df6516601c224236015c6f5d930 /main | |
| parent | 53b1dce587e73bd445d4b2fc35c196d2d20741dd (diff) | |
| parent | 2876bde63494129b78c393851c5f8101e6f9fdf0 (diff) | |
| download | php-git-51cbb85ea9ef758b75bf718985f634b83eb57b34.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix typo
Diffstat (limited to 'main')
| -rw-r--r-- | main/SAPI.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index b182909c71..7858779a62 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -721,7 +721,7 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC) header_line = estrndup(header_line, header_line_len); - /* cut of trailing spaces, linefeeds and carriage-returns */ + /* cut off trailing spaces, linefeeds and carriage-returns */ if (header_line_len && isspace(header_line[header_line_len-1])) { do { header_line_len--; |