diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:53:33 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:53:33 +0300 |
| commit | 543d5eb4957b055319277263fc5219051e297359 (patch) | |
| tree | bfbfcc4c502d0860698b81082d519fc9d39cb3a2 /ext/json/json.c | |
| parent | 87afa6bdc9b310ebafec5d965734c4e467e27c6d (diff) | |
| parent | 56d02d564e946a03e397297d5d5ded112eefd928 (diff) | |
| download | php-git-543d5eb4957b055319277263fc5219051e297359.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
typofixes
Conflicts:
ext/spl/php_spl.c
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 0bf8a645e6..bc0544808f 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -365,7 +365,7 @@ static int json_utf8_to_utf16(unsigned short *utf16, char utf8[], int len) /* {{ } } } else { - /* Only check if utf8 string is valid, and compute utf16 lenght */ + /* Only check if utf8 string is valid, and compute utf16 length */ for (j=0 ; pos < len ; j++) { us = php_next_utf8_char((const unsigned char *)utf8, len, &pos, &status); if (status != SUCCESS) { |