diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-02-28 16:05:19 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-02-28 16:05:19 +0100 |
| commit | 6813f3f5993914d8cf1c229ddf4d4e5fbc60b106 (patch) | |
| tree | d21f7ca359663e3332d68ec4987c5f899a63c0b0 | |
| parent | 97c48cdcb37a6300a5eedc96f09f44bb5222b967 (diff) | |
php-5.5.0-0.16.201302281430
| -rw-r--r-- | php-5.5.0-wip.patch | 39 | ||||
| -rw-r--r-- | php55.spec | 7 |
2 files changed, 4 insertions, 42 deletions
diff --git a/php-5.5.0-wip.patch b/php-5.5.0-wip.patch deleted file mode 100644 index 22be618..0000000 --- a/php-5.5.0-wip.patch +++ /dev/null @@ -1,39 +0,0 @@ -X-Git-Url: http://git.php.net/?p=php-src.git;a=blobdiff_plain;f=ext%2Fsoap%2Fphp_xml.c;h=939385557df326205e62d7d4ae343da1fa6ab02f;hp=a74ec02f435cba9b951d2f3cdd2421acd3a3663b;hb=1e9bc5677505585173ac105c997a09c095f34d1d;hpb=b5d267aa95aec1e89dc34f0bcc3c46576354cd26 - -diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c -index a74ec02..9393855 100644 ---- a/ext/soap/php_xml.c -+++ b/ext/soap/php_xml.c -@@ -100,9 +100,9 @@ xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC) - ctxt->sax->warning = NULL; - ctxt->sax->error = NULL; - /*ctxt->sax->fatalError = NULL;*/ -- old = php_libxml_disable_entity_loader(1); -+ old = php_libxml_disable_entity_loader(1 TSRMLS_CC); - xmlParseDocument(ctxt); -- php_libxml_disable_entity_loader(old); -+ php_libxml_disable_entity_loader(old TSRMLS_CC); - if (ctxt->wellFormed) { - ret = ctxt->myDoc; - if (ret->URL == NULL && ctxt->directory != NULL) { -@@ -133,6 +133,8 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) - xmlParserCtxtPtr ctxt = NULL; - xmlDocPtr ret; - -+ TSRMLS_FETCH(); -+ - /* - xmlInitParser(); - */ -@@ -148,9 +150,9 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) - #if LIBXML_VERSION >= 20703 - ctxt->options |= XML_PARSE_HUGE; - #endif -- old = php_libxml_disable_entity_loader(1); -+ old = php_libxml_disable_entity_loader(1 TSRMLS_CC); - xmlParseDocument(ctxt); -- php_libxml_disable_entity_loader(old); -+ php_libxml_disable_entity_loader(old TSRMLS_CC); - if (ctxt->wellFormed) { - ret = ctxt->myDoc; - if (ret->URL == NULL && ctxt->directory != NULL) { @@ -61,7 +61,7 @@ %global db_devel libdb-devel %endif -%global snapdate 201302211230 +%global snapdate 201302281430 #global rcver RC1 Summary: PHP scripting language for creating dynamic web sites @@ -125,7 +125,6 @@ Patch47: php-5.4.9-phpinfo.patch Patch91: php-5.3.7-oci8conf.patch # WIP -Patch99: php-5.5.0-wip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -785,7 +784,6 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 %patch47 -p1 -b .phpinfo %patch91 -p1 -b .remi-oci8 -%patch99 -p1 -b .wip # wip patches @@ -1650,6 +1648,9 @@ fi %changelog +* Thu Feb 28 2013 Remi Collet <remi@fedoraproject.org> 5.5.0-0.16-201302281430 +- new snapshot + * Thu Feb 21 2013 Remi Collet <remi@fedoraproject.org> 5.5.0-0.16-201302211230 - new snapshot (post alpha 5) |