diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:48:22 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:48:22 +0300 |
| commit | be2128c8050fd8d22604acb0e225891551c81c8c (patch) | |
| tree | a762e220562999130449272443fe9cde49ce9957 /ext/json | |
| parent | 6279246d2c60437c583f9c273075579bf17be654 (diff) | |
| parent | 3f42f2f5d1c8026b6e1d21b91857a08d918c28c8 (diff) | |
| download | php-git-be2128c8050fd8d22604acb0e225891551c81c8c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 6b66dce3df..b7ea5ec54f 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) { |