diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-19 17:55:25 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-19 17:55:25 -0700 |
| commit | dc384a571d4418d274f9ba9b270696950318daaa (patch) | |
| tree | 01ae766f3c45ff0a1ff2e9bb8d5623ee546b86d8 /ext/xml/xml.c | |
| parent | 71c24f4c2e65d7d7fc3679cc14e846cdea83c82e (diff) | |
| parent | c60067c09a32af325d6cd70e4cfa6db3c78a8621 (diff) | |
| download | php-git-dc384a571d4418d274f9ba9b270696950318daaa.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Diffstat (limited to 'ext/xml/xml.c')
0 files changed, 0 insertions, 0 deletions