diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-04-13 01:56:47 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-04-13 01:56:47 +0200 |
| commit | 2876bde63494129b78c393851c5f8101e6f9fdf0 (patch) | |
| tree | bea86fc96e98e0297079239feaa005295b1797d7 | |
| parent | 9302be375436c1b77654443406389c5976a0c20b (diff) | |
| parent | 5a0da281e5a9fa02db18b4822d8b103c65849fa9 (diff) | |
| download | php-git-2876bde63494129b78c393851c5f8101e6f9fdf0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix typo
| -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 6890db3e65..f02bca6d1d 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -717,7 +717,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--; |