diff options
| author | Anatol Belski <ab@php.net> | 2016-07-14 21:13:49 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-07-14 21:13:49 +0200 |
| commit | d0c98366d08d96e3b364e744fca76cc98a0d7f15 (patch) | |
| tree | be0e2123233998056fffa0900dbca026b033be1b | |
| parent | 8bb3bd04a9d38c08dce0034ad8fc1263631d28ff (diff) | |
| parent | fe1d6feb3dfa1eebd69a82c8000d2095b4e8a531 (diff) | |
| download | php-git-d0c98366d08d96e3b364e744fca76cc98a0d7f15.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Extend libxml exports
Updated NEWS
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
Updated NEWS
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
Update PHP 5.5 NEWS entries with CVE info
| -rw-r--r-- | ext/libxml/php_libxml2.def | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/libxml/php_libxml2.def b/ext/libxml/php_libxml2.def index 42a939ebb8..905dbf386b 100644 --- a/ext/libxml/php_libxml2.def +++ b/ext/libxml/php_libxml2.def @@ -1544,3 +1544,5 @@ xmlXPtrNewRangePointNode xmlXPtrNewRangePoints xmlXPtrRangeToFunction xmlXPtrWrapLocationSet +xmlBufContent +xmlBufUse |