diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:51:15 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:51:15 +0300 |
| commit | 56d02d564e946a03e397297d5d5ded112eefd928 (patch) | |
| tree | 7615f37956b630310fcfc9ba083174e58154f48a /ext/json | |
| parent | c6d9bf294681486e7d0ae67b099c0f45e88b35ac (diff) | |
| parent | be2128c8050fd8d22604acb0e225891551c81c8c (diff) | |
| download | php-git-56d02d564e946a03e397297d5d5ded112eefd928.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
typofixes
Diffstat (limited to 'ext/json')
| -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 d4cb39f81d..f52215a484 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -382,7 +382,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) { |