--- CVE-2013-1643.patch	2013-03-22 15:56:21.119459970 +0100
+++ CVE-2013-1824.patch	2013-03-22 15:56:11.447250297 +0100
@@ -20,13 +20,20 @@
  		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 +138,8 @@ xmlDocPtr soap_xmlParseMemory(const void
+@@ -128,11 +133,15 @@ xmlDocPtr soap_xmlParseMemory(const void
+ 	xmlParserCtxtPtr ctxt = NULL;
+ 	xmlDocPtr ret;
+ 
++	TSRMLS_FETCH();
++
+ /*
+ 	xmlInitParser();
  */
  	ctxt = xmlCreateMemoryParserCtxt(buf, buf_size);
  	if (ctxt) {
@@ -35,13 +42,13 @@
  		ctxt->sax->ignorableWhitespace = soap_ignorableWhitespace;
  		ctxt->sax->comment = soap_Comment;
  		ctxt->sax->warning = NULL;
-@@ -141,7 +148,9 @@ xmlDocPtr soap_xmlParseMemory(const void
+@@ -141,7 +150,9 @@ xmlDocPtr soap_xmlParseMemory(const void
  #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) {
