diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 21:34:03 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 21:34:03 +0300 |
| commit | f1d0e50ea8915a18ab5bf24402b787c35552e162 (patch) | |
| tree | 3a009414fc2fa71144e861a69a3b2b777f3cbfc8 | |
| parent | 56d02d564e946a03e397297d5d5ded112eefd928 (diff) | |
| parent | fac08a960be6124829177f6c33c2b10aa3fd81b9 (diff) | |
| download | php-git-f1d0e50ea8915a18ab5bf24402b787c35552e162.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Correct typo in comments: 'initialized'
| -rw-r--r-- | ext/dom/php_dom.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/mb_gpc.c | 2 | ||||
| -rw-r--r-- | ext/spl/php_spl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 0623dbdcde..a9621eeb4c 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -518,7 +518,7 @@ static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp TSRMLS_DC value = null_value; } else if (Z_TYPE_P(value) == IS_OBJECT) { /* these are zvalues create on demand, with refcount and is_ref - * status left in an uninitalized stated */ + * status left in an uninitialized stated */ zval_dtor(value); efree(value); diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index 8036485d6d..8a765fefdd 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -260,7 +260,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i goto out; } - num = n; /* make sure to process initilized vars only */ + num = n; /* make sure to process initialized vars only */ /* initialize converter */ if (info->num_from_encodings <= 0) { diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 3e7106ed25..44611e6158 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -326,7 +326,7 @@ PHP_FUNCTION(spl_autoload) RETURN_FALSE; } - if (file_exts == NULL) { /* autoload_extensions is not initialzed, set to defaults */ + if (file_exts == NULL) { /* autoload_extensions is not initialized, set to defaults */ copy = pos1 = estrndup(SPL_DEFAULT_FILE_EXTENSIONS, sizeof(SPL_DEFAULT_FILE_EXTENSIONS)-1); } else { copy = pos1 = estrndup(file_exts, file_exts_len); |