diff options
| author | Christopher Jones <sixd@php.net> | 2013-07-22 10:58:57 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-07-22 10:58:57 -0700 |
| commit | a1bf38e075ce7d6bbcbcf570444f13ea7558fa41 (patch) | |
| tree | aa492ea45da770d6e6db85dba336945a02765739 /ext/enchant/enchant.c | |
| parent | c7ee677f2f330bbcc8721b6a84dd3a05dc0c5541 (diff) | |
| parent | 25f924abf62e70f3474b5885c12a521c68c2066d (diff) | |
| download | php-git-a1bf38e075ce7d6bbcbcf570444f13ea7558fa41.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Anatol Belski (8) and others
# Via Anatol Belski (2) and others
* 'PHP-5.4' of https://git.php.net/repository/php-src: (44 commits)
fixed possible null deref
- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Fixed bug #65304 (Use of max int in array_sum)
Reorder NEWS
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Properly fixed bug #63186 on NetBSD == 6.0
Improve php.ini-* documentation
5.4.19 is next
Fixed bug #50308 - session id not appended properly for empty anchor tags
Fix bug #62129 - rfc1867 crashes php even though turned off
add news for xml fix
fix TS build
added sapi check for dl() test
Make zval2myslqnd implementations aware of inheritance
Fixed typo ensuring header str is \0 terminated
fix buffer overrun
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
...
Diffstat (limited to 'ext/enchant/enchant.c')
| -rw-r--r-- | ext/enchant/enchant.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index 141192c67f..98b5c9fd87 100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -674,7 +674,7 @@ PHP_FUNCTION(enchant_broker_dict_exists) described/referred to by 'tag'. The ordering is a comma delimited list of provider names. As a special exception, the "*" tag can be used as a language tag to declare a default ordering for any - language that does not explictly declare an ordering. */ + language that does not explicitly declare an ordering. */ PHP_FUNCTION(enchant_broker_set_ordering) { |