Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/161221
Change subject: Updating patches to sync with upstream ...................................................................... Updating patches to sync with upstream Change-Id: Ib34875196b9abfaf8208816bd3f68c6a1129443a Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org> --- D debian/patches/ArrayObject-append-should-delegate-to-ArrayObject-of.patch D debian/patches/ExposeApiVersion D debian/patches/Fix-handling-of-pcre-overflow-expressions.patch D debian/patches/Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch D debian/patches/change_api_version A debian/patches/fix-sql-warning.patch D debian/patches/fix_fastcgi_handling D debian/patches/fix_freetype_include R debian/patches/remove_libpam.patch M debian/patches/series R debian/patches/typos.patch 11 files changed, 46 insertions(+), 1,997 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm refs/changes/21/161221/1 diff --git a/debian/patches/ArrayObject-append-should-delegate-to-ArrayObject-of.patch b/debian/patches/ArrayObject-append-should-delegate-to-ArrayObject-of.patch deleted file mode 100644 index c4cbc51..0000000 --- a/debian/patches/ArrayObject-append-should-delegate-to-ArrayObject-of.patch +++ /dev/null @@ -1,89 +0,0 @@ -From be5c755780e52193e00d55cca9475381b3913c35 Mon Sep 17 00:00:00 2001 -From: aude <aude.w...@gmail.com> -Date: Fri, 15 Aug 2014 15:07:14 -0700 -Subject: [PATCH] ArrayObject::append() should delegate to - ArrayObject::offsetSet() - -Summary: Match php5 implementation by delegating rather than direct manipulation of internal state. -Fixes issue #3403. -Closes https://github.com/facebook/hhvm/pull/3404 - -Reviewed By: @fredemmott - -Differential Revision: D1486300 - -Pulled By: svcscm ---- - hphp/system/php/spl/miscellaneous/ArrayObject.php | 2 +- - hphp/test/slow/array_object/append.php | 15 +++++++++++++++ - hphp/test/slow/array_object/append.php.expect | 18 ++++++++++++++++++ - 3 files changed, 34 insertions(+), 1 deletion(-) - -diff --git a/hphp/system/php/spl/miscellaneous/ArrayObject.php b/hphp/system/php/spl/miscellaneous/ArrayObject.php -index d405cc0..ed020c1 100644 ---- a/hphp/system/php/spl/miscellaneous/ArrayObject.php -+++ b/hphp/system/php/spl/miscellaneous/ArrayObject.php -@@ -72,7 +72,7 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, - 'use ArrayObject::offsetSet() instead' - ); - } -- $this->storage[] = $value; -+ $this->offsetSet(null, $value); - } - - // This doc comment block generated by idl/sysdoc.php -diff --git a/hphp/test/slow/array_object/append.php b/hphp/test/slow/array_object/append.php -index da7f7ca..ba5c292 100644 ---- a/hphp/test/slow/array_object/append.php -+++ b/hphp/test/slow/array_object/append.php -@@ -1,6 +1,21 @@ - <?php - -+class ExtendedArrayObject extends ArrayObject { -+ public function offsetSet($key, $value) { -+ $key = 'q1'; -+ parent::offsetSet($key, $value); -+ } -+} -+ - $arrayobj = new ArrayObject(array('first','second','third')); - $arrayobj->append('fourth'); - $arrayobj->append(array('five', 'six')); - var_dump($arrayobj); -+ -+$arrayobj = new ExtendedArrayObject(array('y')); -+$arrayobj->append('x'); -+var_dump($arrayobj); -+ -+$arrayobj = new ExtendedArrayObject(array('q2' => 'y')); -+$arrayobj->append('z'); -+var_dump($arrayobj); -diff --git a/hphp/test/slow/array_object/append.php.expect b/hphp/test/slow/array_object/append.php.expect -index 194af66..45e2fdb 100644 ---- a/hphp/test/slow/array_object/append.php.expect -+++ b/hphp/test/slow/array_object/append.php.expect -@@ -18,3 +18,21 @@ object(ArrayObject)#1 (1) { - } - } - } -+object(ExtendedArrayObject)#2 (1) { -+ ["storage":"ArrayObject":private]=> -+ array(2) { -+ [0]=> -+ string(1) "y" -+ ["q1"]=> -+ string(1) "x" -+ } -+} -+object(ExtendedArrayObject)#3 (1) { -+ ["storage":"ArrayObject":private]=> -+ array(2) { -+ ["q2"]=> -+ string(1) "y" -+ ["q1"]=> -+ string(1) "z" -+ } -+} --- -2.1.0.rc1 - diff --git a/debian/patches/ExposeApiVersion b/debian/patches/ExposeApiVersion deleted file mode 100644 index 8f7edab..0000000 --- a/debian/patches/ExposeApiVersion +++ /dev/null @@ -1,26 +0,0 @@ -From eeec7e0b09c8770763596942e646ab69a5436de7 Mon Sep 17 00:00:00 2001 -From: Ori Livneh <o...@wikimedia.org> -Date: Wed, 30 Jul 2014 17:00:13 -0700 -Subject: [PATCH] Expose extension API version in output of 'hhvm --version' - -It's useful for packaging and configuration management scripts that want to -determine where dynamic extension files should be placed. ---- - hphp/runtime/base/program-functions.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hphp/runtime/base/program-functions.cpp b/hphp/runtime/base/program-functions.cpp -index 1a8673f..2520090 100644 ---- a/hphp/runtime/base/program-functions.cpp -+++ b/hphp/runtime/base/program-functions.cpp -@@ -1188,6 +1188,7 @@ static int execute_program_impl(int argc, char** argv) { - cout << " (" << (debug ? "dbg" : "rel") << ")\n"; - cout << "Compiler: " << kCompilerId << "\n"; - cout << "Repo schema: " << kRepoSchemaId << "\n"; -+ cout << "Extension API: " << std::to_string(HHVM_API_VERSION) << "\n"; - return 0; - } - if (vm.count("compiler-id")) { --- -2.0.3 - diff --git a/debian/patches/Fix-handling-of-pcre-overflow-expressions.patch b/debian/patches/Fix-handling-of-pcre-overflow-expressions.patch deleted file mode 100644 index 0ebed6c..0000000 --- a/debian/patches/Fix-handling-of-pcre-overflow-expressions.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 968dfa256cef0f48c7b574857f105d5d8dd54703 Mon Sep 17 00:00:00 2001 -From: aravind <arav...@fb.com> -Date: Mon, 18 Aug 2014 14:10:34 -0700 -Subject: [PATCH] Fix handling of pcre overflow expressions - -Summary: Couple of fixes to the handling of pcre compiled expressions that overflow the default pcre cache: - -s_pcre_globals should smart-free m_overflow at the end of the request, and should free() the set of overflow expressions themselves. - -Reviewed By: @markw65 - -Differential Revision: D1503955 ---- - hphp/runtime/base/preg.cpp | 13 ++++++++++++- - hphp/runtime/base/preg.h | 1 + - hphp/runtime/base/program-functions.cpp | 3 +++ - hphp/runtime/base/program-functions.h | 1 + - hphp/test/slow/ext_preg/preg_cache_overflow.php | 17 +++++++++++++++++ - hphp/test/slow/ext_preg/preg_cache_overflow.php.expectf | 5 +++++ - hphp/test/slow/ext_preg/preg_cache_overflow.php.opts | 1 + - 7 files changed, 40 insertions(+), 1 deletion(-) - create mode 100644 hphp/test/slow/ext_preg/preg_cache_overflow.php - create mode 100644 hphp/test/slow/ext_preg/preg_cache_overflow.php.expectf - create mode 100644 hphp/test/slow/ext_preg/preg_cache_overflow.php.opts - -diff --git a/hphp/runtime/base/preg.cpp b/hphp/runtime/base/preg.cpp -index c97ea05..5b9b4dc 100644 ---- a/hphp/runtime/base/preg.cpp -+++ b/hphp/runtime/base/preg.cpp -@@ -57,8 +57,19 @@ pcre_cache_entry::~pcre_cache_entry() { - pcre_free(re); - } - -+void PCREglobals::onSessionExit() { -+ for (auto entry: m_overflow) { -+ delete entry; -+ } -+ smart::vector<const pcre_cache_entry*>().swap(m_overflow); -+} -+ - PCREglobals::~PCREglobals() { -- m_overflow.clear(); -+ onSessionExit(); -+} -+ -+void pcre_session_exit() { -+ s_pcre_globals->onSessionExit(); - } - - void PCREglobals::cleanupOnRequestEnd(const pcre_cache_entry* ent) { -diff --git a/hphp/runtime/base/preg.h b/hphp/runtime/base/preg.h -index da2c1a6..4699214 100644 ---- a/hphp/runtime/base/preg.h -+++ b/hphp/runtime/base/preg.h -@@ -70,6 +70,7 @@ class PCREglobals { - PCREglobals() { } - ~PCREglobals(); - void cleanupOnRequestEnd(const pcre_cache_entry* ent); -+ void onSessionExit(); - // pcre ini_settings - int64_t m_preg_backtrace_limit; - int64_t m_preg_recursion_limit; -diff --git a/hphp/runtime/base/program-functions.cpp b/hphp/runtime/base/program-functions.cpp -index 502daa3..63d1860 100644 ---- a/hphp/runtime/base/program-functions.cpp -+++ b/hphp/runtime/base/program-functions.cpp -@@ -1791,6 +1791,9 @@ void hphp_session_exit() { - // reinitialize g_context here. - g_context.getCheck(); - -+ // Clean up pcre state at the end of the request. -+ pcre_session_exit(); -+ - mm.sweep(); - - // Destroy g_context again because ExecutionContext has -diff --git a/hphp/runtime/base/program-functions.h b/hphp/runtime/base/program-functions.h -index c623fa5..9c3e053 100644 ---- a/hphp/runtime/base/program-functions.h -+++ b/hphp/runtime/base/program-functions.h -@@ -74,6 +74,7 @@ class ExecutionContext; - - void pcre_init(); - void pcre_reinit(); -+void pcre_session_exit(); - void hphp_process_init(); - void hphp_session_init(); - -diff --git a/hphp/test/slow/ext_preg/preg_cache_overflow.php b/hphp/test/slow/ext_preg/preg_cache_overflow.php -new file mode 100644 -index 0000000..4106efe ---- /dev/null -+++ b/hphp/test/slow/ext_preg/preg_cache_overflow.php -@@ -0,0 +1,17 @@ -+<?php -+ -+$matches = 1; -+for ($i=1 ; $i < 1050 ; $i++) { -+ $db_name = 'dbs.'.rand(); -+ -+ if (preg_match("/^dbs\.(\d+)$/", $db_name, $match)) { -+ $db_num = $match[1]; -+ $printable_db_name = preg_replace('/' .$db_num.'/', '%d', $db_name); -+ if (!$printable_db_name) { -+ var_dump("preg_replace returned false"); -+ break; -+ } -+ ++$matches; -+ } -+} -+var_dump(sprintf("%d matches", $matches)); -diff --git a/hphp/test/slow/ext_preg/preg_cache_overflow.php.expectf b/hphp/test/slow/ext_preg/preg_cache_overflow.php.expectf -new file mode 100644 -index 0000000..abf509a ---- /dev/null -+++ b/hphp/test/slow/ext_preg/preg_cache_overflow.php.expectf -@@ -0,0 +1,5 @@ -+string(14) "100000 matches" -+string(14) "100000 matches" -+string(14) "100000 matches" -+string(14) "100000 matches" -+string(14) "100000 matches" -diff --git a/hphp/test/slow/ext_preg/preg_cache_overflow.php.opts b/hphp/test/slow/ext_preg/preg_cache_overflow.php.opts -new file mode 100644 -index 0000000..df6e913 ---- /dev/null -+++ b/hphp/test/slow/ext_preg/preg_cache_overflow.php.opts -@@ -0,0 +1 @@ -+-vEval.PCRETableSize=128 --count 5 diff --git a/debian/patches/Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch b/debian/patches/Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch deleted file mode 100644 index b9c418e..0000000 --- a/debian/patches/Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch +++ /dev/null @@ -1,1454 +0,0 @@ -From c3857d143af5d520d4002960163780e0ba01eed9 Mon Sep 17 00:00:00 2001 -From: bsimmers <bsimm...@fb.com> -Date: Mon, 21 Jul 2014 17:24:57 -0700 -Subject: [PATCH] Support stream wrappers in XML parser extensions, add - external entity loader - -Summary: -* Support stream wrappers in SimpleXML, DOM and XMLReader input and - output filenames. -* Rename libxml_input_buffer() to libxml_create_input_buffer(). -* Implement userspace function libxml_set_streams_context(), was - previously missing. -* Since the VM can now be re-entered during parsing, with libxml2 in the - call stack with -fomit-frame-pointer, all XML parsing functions must - be protected with SYNC_VM_REGS_SCOPED(). -* In DOMDocument, don't do File::TranslatePath() on input filenames, - since they can now be URLs, and translation is now redundant with that - done by FileStreamWrapper. -* In simplexml_load_file(), call xmlReadFile() instead of - f_file_get_contents(), so that the libxml default stream context is - used. Almost fixes test/zend/bad/ext/libxml/tests/bug54440.php, except - for a minor error handling issue that should be dealt with by GitHub - PR #2376. -* In stream_context_create(), return a default stream context resource - when the options fail validation, instead of returning false. This - matches the PHP behaviour and makes - hphp/test/zend/bad/ext/libxml/tests/bug63389.php pass. -* Move passing tests to hphp/test/zend/good -* Add test.xml, copied from PHP 5.6.0-dev, needed by a passing test. -* Add an external entity loader. This allows the use of "data:" and - "compress.zlib:" in entities and URIs. - -Since loading external entities exposes a number of security issues including -remote shell execution, it's disabled by default (except for the data: protocol -which isn't actually external). The new config option is documented in -doc/inconsistencies. - -Submitted on behalf of a third-party: The PHP Group -Source: PHP 5.6.0-dev -License: version 3.01 of the PHP license - -Closes: #2329 -Closes: #2829 - -Test Plan: automated tests, new version of zend test to make sure external -entity loading fails by default ---- - hphp/doc/inconsistencies | 5 + - hphp/runtime/base/stream-wrapper-registry.cpp | 23 +- - hphp/runtime/base/stream-wrapper-registry.h | 2 + - hphp/runtime/ext/ext_domdocument.cpp | 82 ++++--- - hphp/runtime/ext/ext_simplexml.cpp | 43 +++- - hphp/runtime/ext/ext_xml.cpp | 2 +- - hphp/runtime/ext/ext_xmlreader.cpp | 16 ++ - hphp/runtime/ext/libxml/ext_libxml.cpp | 241 +++++++++++++++++++-- - hphp/runtime/ext/libxml/ext_libxml.h | 4 + - hphp/runtime/ext/libxml/ext_libxml.php | 4 + - hphp/runtime/ext/stream/ext_stream.cpp | 4 +- - hphp/runtime/ext/xsl/ext_xsl.cpp | 1 + - hphp/test/quick/xml_entity_loader.php | 15 ++ - hphp/test/quick/xml_entity_loader.php.expect | 1 + - hphp/test/slow/dom_document/xinclude.php.ini | 1 + - hphp/test/tools/import_zend_test.py | 1 - - hphp/test/zend/bad/ext/libxml/tests/004.php | 23 -- - .../test/zend/bad/ext/libxml/tests/004.php.expectf | 29 --- - hphp/test/zend/bad/ext/libxml/tests/bug63389.php | 6 - - .../zend/bad/ext/libxml/tests/bug63389.php.expectf | 3 - - hphp/test/zend/bad/ext/xsl/tests/xslt008.php | 14 -- - .../zend/bad/ext/xsl/tests/xslt008.php.expectf | 7 - - .../test/zend/bad/ext/xsl/tests/xslt008.php.skipif | 4 - - hphp/test/zend/good/ext/libxml/tests/004.php | 23 ++ - .../zend/good/ext/libxml/tests/004.php.expectf | 29 +++ - hphp/test/zend/good/ext/libxml/tests/bug63389.php | 6 + - .../good/ext/libxml/tests/bug63389.php.expectf | 3 + - .../tests/libxml_disable_entity_loader.php.ini | 1 + - hphp/test/zend/good/ext/libxml/tests/test.xml | 8 + - .../test/zend/good/ext/xmlreader/tests/007.php.ini | 1 + - .../test/zend/good/ext/xmlreader/tests/008.php.ini | 1 + - .../test/zend/good/ext/xmlreader/tests/012.php.ini | 1 + - hphp/test/zend/good/ext/xsl/tests/bug53965.php | 15 ++ - .../zend/good/ext/xsl/tests/bug53965.php.expectf | 4 + - hphp/test/zend/good/ext/xsl/tests/bug53965.php.ini | 1 + - .../zend/good/ext/xsl/tests/bug53965.php.skipif | 3 + - .../zend/good/ext/xsl/tests/xslt008-disabled.php | 14 ++ - .../ext/xsl/tests/xslt008-disabled.php.expectf | 8 + - hphp/test/zend/good/ext/xsl/tests/xslt008.php | 14 ++ - .../zend/good/ext/xsl/tests/xslt008.php.expectf | 7 + - hphp/test/zend/good/ext/xsl/tests/xslt008.php.ini | 1 + - .../zend/good/ext/xsl/tests/xslt008.php.norepo | 0 - .../zend/good/ext/xsl/tests/xslt008.php.skipif | 4 + - hphp/util/trace.h | 3 +- - 44 files changed, 515 insertions(+), 163 deletions(-) - create mode 100644 hphp/test/quick/xml_entity_loader.php - create mode 100644 hphp/test/quick/xml_entity_loader.php.expect - create mode 100644 hphp/test/slow/dom_document/xinclude.php.ini - delete mode 100644 hphp/test/zend/bad/ext/libxml/tests/004.php - delete mode 100644 hphp/test/zend/bad/ext/libxml/tests/004.php.expectf - delete mode 100644 hphp/test/zend/bad/ext/libxml/tests/bug63389.php - delete mode 100644 hphp/test/zend/bad/ext/libxml/tests/bug63389.php.expectf - delete mode 100644 hphp/test/zend/bad/ext/xsl/tests/xslt008.php - delete mode 100644 hphp/test/zend/bad/ext/xsl/tests/xslt008.php.expectf - delete mode 100644 hphp/test/zend/bad/ext/xsl/tests/xslt008.php.skipif - create mode 100644 hphp/test/zend/good/ext/libxml/tests/004.php - create mode 100644 hphp/test/zend/good/ext/libxml/tests/004.php.expectf - create mode 100644 hphp/test/zend/good/ext/libxml/tests/bug63389.php - create mode 100644 hphp/test/zend/good/ext/libxml/tests/bug63389.php.expectf - create mode 100644 hphp/test/zend/good/ext/libxml/tests/libxml_disable_entity_loader.php.ini - create mode 100644 hphp/test/zend/good/ext/libxml/tests/test.xml - create mode 100644 hphp/test/zend/good/ext/xmlreader/tests/007.php.ini - create mode 100644 hphp/test/zend/good/ext/xmlreader/tests/008.php.ini - create mode 100644 hphp/test/zend/good/ext/xmlreader/tests/012.php.ini - create mode 100644 hphp/test/zend/good/ext/xsl/tests/bug53965.php - create mode 100644 hphp/test/zend/good/ext/xsl/tests/bug53965.php.expectf - create mode 100644 hphp/test/zend/good/ext/xsl/tests/bug53965.php.ini - create mode 100644 hphp/test/zend/good/ext/xsl/tests/bug53965.php.skipif - create mode 100644 hphp/test/zend/good/ext/xsl/tests/xslt008-disabled.php - create mode 100644 hphp/test/zend/good/ext/xsl/tests/xslt008-disabled.php.expectf - create mode 100644 hphp/test/zend/good/ext/xsl/tests/xslt008.php - create mode 100644 hphp/test/zend/good/ext/xsl/tests/xslt008.php.expectf - create mode 100644 hphp/test/zend/good/ext/xsl/tests/xslt008.php.ini - create mode 100644 hphp/test/zend/good/ext/xsl/tests/xslt008.php.norepo - create mode 100644 hphp/test/zend/good/ext/xsl/tests/xslt008.php.skipif - -diff --git a/hphp/doc/inconsistencies b/hphp/doc/inconsistencies -index a090e49..7748f4c 100644 ---- a/hphp/doc/inconsistencies -+++ b/hphp/doc/inconsistencies -@@ -157,3 +157,8 @@ conversion inside the condition of an if statement or similar. - - (7) All fatals prevent further PHP code from executing, including __destruct - methods. N.B.: exit() is a fatal. -+ -+(8) Loading of external entities in the libxml extension is disabled by default -+for security reasons. It can be re-enabled on a per-protocol basis (file, http, -+compress.zlib, etc...) with a comma-separated list in the ini setting -+hhvm.libxml.ext_entity_whitelist. -diff --git a/hphp/runtime/base/stream-wrapper-registry.cpp b/hphp/runtime/base/stream-wrapper-registry.cpp -index 9711a5e..73490b6 100644 ---- a/hphp/runtime/base/stream-wrapper-registry.cpp -+++ b/hphp/runtime/base/stream-wrapper-registry.cpp -@@ -182,25 +182,20 @@ Wrapper* getWrapper(const String& scheme, bool warn /*= false */) { - return nullptr; - } - --Wrapper* getWrapperFromURI(const String& uri, -- int* pathIndex /* = NULL */, -- bool warn /*= true */) { -- const char *uri_string = uri.data(); -- -+String getWrapperProtocol(const char* uri_string, int* pathIndex) { - /* Special case for PHP4 Backward Compatability */ - if (!strncasecmp(uri_string, "zlib:", sizeof("zlib:") - 1)) { -- return getWrapper(s_compress_zlib, warn); -+ return s_compress_zlib; - } - - // data wrapper can come with or without a double forward slash - if (!strncasecmp(uri_string, "data:", sizeof("data:") - 1)) { -- return getWrapper(s_data, warn); -+ return s_data; - } - - int n = 0; - const char* p = uri_string; -- while (*p && (isalnum((unsigned char)*p) || -- *p == '+' || *p == '-' || *p == '.')) { -+ while (*p && (isalnum(*p) || *p == '+' || *p == '-' || *p == '.')) { - n++; - p++; - } -@@ -210,12 +205,18 @@ Wrapper* getWrapperFromURI(const String& uri, - } - - if (!colon) { -- return getWrapper(s_file, warn); -+ return s_file; - } - - int len = colon - uri_string; - if (pathIndex != nullptr) *pathIndex = len + sizeof("://") - 1; -- return getWrapper(String(uri_string, len, CopyString), warn); -+ return String(uri_string, len, CopyString); -+} -+ -+Wrapper* getWrapperFromURI(const String& uri, -+ int* pathIndex /* = NULL */, -+ bool warn /*= true */) { -+ return getWrapper(getWrapperProtocol(uri.data(), pathIndex), warn); - } - - static FileStreamWrapper s_file_stream_wrapper; -diff --git a/hphp/runtime/base/stream-wrapper-registry.h b/hphp/runtime/base/stream-wrapper-registry.h -index fdb3a9e..5a67f0d 100644 ---- a/hphp/runtime/base/stream-wrapper-registry.h -+++ b/hphp/runtime/base/stream-wrapper-registry.h -@@ -33,6 +33,8 @@ bool disableWrapper(const String& scheme); - bool restoreWrapper(const String& scheme); - bool registerRequestWrapper(const String& scheme, std::unique_ptr<Wrapper> wrapper); - Array enumWrappers(); -+ -+String getWrapperProtocol(const char* url, int* pathIndex = nullptr); - Wrapper* getWrapper(const String& scheme, bool warn = true); - Wrapper* getWrapperFromURI(const String& uri, - int* pathIndex = nullptr, bool warn = true); -diff --git a/hphp/runtime/ext/ext_domdocument.cpp b/hphp/runtime/ext/ext_domdocument.cpp -index 687de2c..147efad 100644 ---- a/hphp/runtime/ext/ext_domdocument.cpp -+++ b/hphp/runtime/ext/ext_domdocument.cpp -@@ -634,7 +634,7 @@ static xmlNsPtr dom_get_ns(xmlNodePtr nodep, const char *uri, int *errorcode, - } - - static xmlDocPtr dom_document_parser(c_DOMDocument * domdoc, int mode, -- char *source, int source_len, -+ const String& source, - int options) { - xmlDocPtr ret = NULL; - xmlParserCtxtPtr ctxt = NULL; -@@ -651,27 +651,37 @@ static xmlDocPtr dom_document_parser(c_DOMDocument * domdoc, int mode, - if (mode == DOM_LOAD_FILE) { - String file_dest = libxml_get_valid_file_path(source); - if (!file_dest.empty()) { -- ctxt = xmlCreateFileParserCtxt(file_dest.data()); -+ // This is considerably more verbose than just using -+ // xmlCreateFileParserCtxt, but it allows us to bypass the external -+ // entity loading path, which is locked down by default for security -+ // reasons. -+ auto stream = File::Open(file_dest, "rb"); -+ if (!stream.isInvalid()) { -+ ctxt = xmlCreateIOParserCtxt(nullptr, nullptr, -+ libxml_streams_IO_read, -+ libxml_streams_IO_close, -+ stream.get(), -+ XML_CHAR_ENCODING_NONE); -+ -+ // We're storing a reference in the xmlParserCtxt -+ if (ctxt) stream.get()->incRefCount(); -+ } - } - } else { -- ctxt = xmlCreateMemoryParserCtxt(source, source_len); -+ ctxt = xmlCreateMemoryParserCtxt(source.data(), source.size()); - } - -- if (ctxt == NULL) { -- return NULL; -- } -+ if (ctxt == NULL) return NULL; - -- /* If loading from memory, we need to set the base directory -- for the document */ -+ /* If loading from memory, we need to set the base directory for the -+ * document */ - if (mode != DOM_LOAD_FILE) { - String directory = g_context->getCwd(); - if (!directory.empty()) { -- if (ctxt->directory != NULL) { -- xmlFree((char *) ctxt->directory); -- } -- if (directory[directory.size() - 1] != '/') { -- directory += "/"; -- } -+ if (ctxt->directory != NULL) xmlFree(ctxt->directory); -+ -+ if (directory[directory.size() - 1] != '/') directory += "/"; -+ - ctxt->directory = - (char*)xmlCanonicPath((const xmlChar*)directory.c_str()); - } -@@ -712,9 +722,15 @@ static xmlDocPtr dom_document_parser(c_DOMDocument * domdoc, int mode, - if (ctxt->recovery) { - HHVM_FN(error_reporting)(old_error_reporting); - } -- /* If loading from memory, set the base reference uri for the document */ -- if (ret && ret->URL == NULL && ctxt->directory != NULL) { -- ret->URL = xmlStrdup((xmlChar*)ctxt->directory); -+ if (ret && ret->URL == NULL) { -+ if (mode == DOM_LOAD_FILE) { -+ ret->URL = xmlStrdup((xmlChar*)source.c_str()); -+ } else { -+ /* If loading from memory, set the base reference uri for the document */ -+ if (ctxt->directory != NULL) { -+ ret->URL = xmlStrdup((xmlChar*)ctxt->directory); -+ } -+ } - } - } else { - ret = NULL; -@@ -734,8 +750,7 @@ static Variant dom_parse_document(c_DOMDocument *domdoc, const String& source, - return false; - } - xmlDoc *newdoc = -- dom_document_parser(domdoc, mode, (char*)source.data(), source.length(), -- options); -+ dom_document_parser(domdoc, mode, source, options); - if (!newdoc) { - return false; - } -@@ -3353,12 +3368,7 @@ Variant c_DOMDocument::t_importnode(const Object& importednode, - Variant c_DOMDocument::t_load(const String& filename, - int64_t options /* = 0 */) { - SYNC_VM_REGS_SCOPED(); -- String translated = File::TranslatePath(filename); -- if (translated.empty()) { -- raise_warning("Unable to read file: %s", filename.data()); -- return false; -- } -- return dom_parse_document(this, translated, options, DOM_LOAD_FILE); -+ return dom_parse_document(this, filename, options, DOM_LOAD_FILE); - } - - Variant c_DOMDocument::t_loadhtml(const String& source) { -@@ -3368,12 +3378,7 @@ Variant c_DOMDocument::t_loadhtml(const String& source) { - - Variant c_DOMDocument::t_loadhtmlfile(const String& filename) { - SYNC_VM_REGS_SCOPED(); -- String translated = File::TranslatePath(filename); -- if (translated.empty()) { -- raise_warning("Unable to read file: %s", filename.data()); -- return false; -- } -- return dom_load_html(this, translated, DOM_LOAD_FILE); -+ return dom_load_html(this, filename, DOM_LOAD_FILE); - } - - Variant c_DOMDocument::t_loadxml(const String& source, -@@ -3424,19 +3429,13 @@ Variant c_DOMDocument::t_save(const String& file, int64_t options /* = 0 */) { - xmlDocPtr docp = (xmlDocPtr)m_node; - int bytes, format = 0, saveempty = 0; - -- String translated = File::TranslatePath(file); -- if (translated.empty()) { -- raise_warning("Invalid Filename"); -- return false; -- } -- - /* encoding handled by property on doc */ - format = m_formatoutput; - if (options & LIBXML_SAVE_NOEMPTYTAG) { - saveempty = xmlSaveNoEmptyTags; - xmlSaveNoEmptyTags = 1; - } -- bytes = xmlSaveFormatFileEnc(translated.data(), docp, NULL, format); -+ bytes = xmlSaveFormatFileEnc(file.data(), docp, NULL, format); - if (options & LIBXML_SAVE_NOEMPTYTAG) { - xmlSaveNoEmptyTags = saveempty; - } -@@ -3450,14 +3449,9 @@ Variant c_DOMDocument::t_savehtmlfile(const String& file) { - xmlDocPtr docp = (xmlDocPtr)m_node; - int bytes, format = 0; - -- String translated = File::TranslatePath(file); -- if (translated.empty()) { -- raise_warning("Invalid Filename"); -- return false; -- } - /* encoding handled by property on doc */ - format = m_formatoutput; -- bytes = htmlSaveFileFormat(translated.data(), docp, NULL, format); -+ bytes = htmlSaveFileFormat(file.data(), docp, NULL, format); - if (bytes == -1) { - return false; - } -diff --git a/hphp/runtime/ext/ext_simplexml.cpp b/hphp/runtime/ext/ext_simplexml.cpp -index 235caf0..a506179 100644 ---- a/hphp/runtime/ext/ext_simplexml.cpp -+++ b/hphp/runtime/ext/ext_simplexml.cpp -@@ -22,6 +22,7 @@ - #include "hphp/runtime/ext/ext_domdocument.h" - #include "hphp/runtime/ext/libxml/ext_libxml.h" - #include "hphp/system/systemlib.h" -+#include "hphp/runtime/vm/vm-regs.h" - - namespace HPHP { - -@@ -1128,6 +1129,7 @@ Variant f_simplexml_load_string( - int64_t options /* = 0 */, - const String& ns /* = "" */, - bool is_prefix /* = false */) { -+ SYNC_VM_REGS_SCOPED(); - Class* cls = class_from_name(class_name, "simplexml_load_string"); - if (!cls) { - return init_null(); -@@ -1152,8 +1154,44 @@ Variant f_simplexml_load_file(const String& filename, - const String& class_name /* = "SimpleXMLElement" */, - int64_t options /* = 0 */, const String& ns /* = "" */, - bool is_prefix /* = false */) { -- String str = f_file_get_contents(filename); -- return f_simplexml_load_string(str, class_name, options, ns, is_prefix); -+ SYNC_VM_REGS_SCOPED(); -+ Class* cls = class_from_name(class_name, "simplexml_load_file"); -+ if (!cls) { -+ return init_null(); -+ } -+ -+ auto stream = File::Open(filename, "rb"); -+ if (stream.isInvalid()) return false; -+ -+ xmlDocPtr doc = nullptr; -+ xmlParserCtxtPtr ctxt = xmlCreateIOParserCtxt(nullptr, nullptr, -+ libxml_streams_IO_read, -+ libxml_streams_IO_close, -+ stream.get(), -+ XML_CHAR_ENCODING_NONE); -+ if (ctxt == nullptr) return false; -+ stream.get()->incRefCount(); -+ SCOPE_EXIT { xmlFreeParserCtxt(ctxt); }; -+ -+ if (ctxt->directory == nullptr) { -+ ctxt->directory = xmlParserGetDirectory(filename.c_str()); -+ } -+ xmlParseDocument(ctxt); -+ if (ctxt->wellFormed) { -+ doc = ctxt->myDoc; -+ } else { -+ xmlFreeDoc(ctxt->myDoc); -+ ctxt->myDoc = nullptr; -+ return false; -+ } -+ -+ Object obj = create_object(cls->nameStr(), Array(), false); -+ c_SimpleXMLElement* sxe = obj.getTyped<c_SimpleXMLElement>(); -+ sxe->document = Resource(NEWOBJ(XmlDocWrapper)(doc)); -+ sxe->node = xmlDocGetRootElement(doc); -+ sxe->iter.nsprefix = ns.size() ? xmlStrdup((xmlChar*)ns.data()) : nullptr; -+ sxe->iter.isprefix = is_prefix; -+ return obj; - } - - /////////////////////////////////////////////////////////////////////////////// -@@ -1198,6 +1236,7 @@ void c_SimpleXMLElement::t___construct(const String& data, - bool data_is_url /* = false */, - const String& ns /* = "" */, - bool is_prefix /* = false */) { -+ SYNC_VM_REGS_SCOPED(); - xmlDocPtr docp = data_is_url ? - xmlReadFile(data.data(), nullptr, options) : - xmlReadMemory(data.data(), data.size(), nullptr, nullptr, options); -diff --git a/hphp/runtime/ext/ext_xml.cpp b/hphp/runtime/ext/ext_xml.cpp -index 5b07ad8..3f8ab47 100644 ---- a/hphp/runtime/ext/ext_xml.cpp -+++ b/hphp/runtime/ext/ext_xml.cpp -@@ -717,8 +717,8 @@ int64_t f_xml_parse(const Resource& parser, const String& data, bool is_final /* - - int64_t f_xml_parse_into_struct(const Resource& parser, const String& data, VRefParam values, - VRefParam index /* = null */) { -+ SYNC_VM_REGS_SCOPED(); - int ret; -- VMRegAnchor _; - XmlParser * p = parser.getTyped<XmlParser>(); - values = Array::Create(); - p->data.assignRef(values); -diff --git a/hphp/runtime/ext/ext_xmlreader.cpp b/hphp/runtime/ext/ext_xmlreader.cpp -index 3d71769..2911309 100644 ---- a/hphp/runtime/ext/ext_xmlreader.cpp -+++ b/hphp/runtime/ext/ext_xmlreader.cpp -@@ -22,6 +22,7 @@ - #include "hphp/util/functional.h" - #include "hphp/util/hash-map-typedefs.h" - #include "hphp/system/systemlib.h" -+#include "hphp/runtime/vm/vm-regs.h" - - namespace HPHP { - -@@ -112,6 +113,7 @@ void c_XMLReader::t___construct() { - } - - bool c_XMLReader::t_open(const String& uri, const String& encoding /*= null_string*/, int64_t options /*= 0*/) { -+ SYNC_VM_REGS_SCOPED(); - if (m_ptr) { - t_close(); - } -@@ -184,6 +186,7 @@ bool c_XMLReader::t_xml(const String& source, const String& encoding /*= null_st - } - - void c_XMLReader::close_impl() { -+ SYNC_VM_REGS_SCOPED(); - if (m_ptr) { - xmlFreeTextReader(m_ptr); - m_ptr = NULL; -@@ -204,6 +207,7 @@ bool c_XMLReader::t_close() { - } - - bool c_XMLReader::t_read() { -+ SYNC_VM_REGS_SCOPED(); - if (m_ptr) { - int ret = xmlTextReaderRead(m_ptr); - if (ret == -1) { -@@ -218,6 +222,7 @@ bool c_XMLReader::t_read() { - } - - bool c_XMLReader::t_next(const String& localname /*= null_string*/) { -+ SYNC_VM_REGS_SCOPED(); - if (m_ptr) { - int ret = xmlTextReaderNext(m_ptr); - while (!localname.empty() && ret == 1) { -@@ -238,6 +243,7 @@ bool c_XMLReader::t_next(const String& localname /*= null_string*/) { - } - - String c_XMLReader::read_string_func(xmlreader_read_char_t internal_function) { -+ SYNC_VM_REGS_SCOPED(); - char *retchar = NULL; - if (m_ptr) { - retchar = (char *)internal_function(m_ptr); -@@ -264,6 +270,7 @@ String c_XMLReader::t_readouterxml() { - } - - bool c_XMLReader::bool_func_no_arg(xmlreader_read_int_t internal_function) { -+ SYNC_VM_REGS_SCOPED(); - if (m_ptr) { - int ret = internal_function(m_ptr); - if (ret == 1) { -@@ -274,6 +281,7 @@ bool c_XMLReader::bool_func_no_arg(xmlreader_read_int_t internal_function) { - } - - Variant c_XMLReader::string_func_string_arg(String value, xmlreader_read_one_char_t internal_function) { -+ SYNC_VM_REGS_SCOPED(); - - if (value.empty()) { - raise_warning("Argument cannot be an empty string"); -@@ -299,6 +307,7 @@ Variant c_XMLReader::t_getattribute(const String& name) { - } - - Variant c_XMLReader::t_getattributeno(int64_t index) { -+ SYNC_VM_REGS_SCOPED(); - char *retchar = NULL; - if (m_ptr) { - retchar = (char *)xmlTextReaderGetAttributeNo(m_ptr, index); -@@ -313,6 +322,7 @@ Variant c_XMLReader::t_getattributeno(int64_t index) { - } - - Variant c_XMLReader::t_getattributens(const String& name, const String& namespaceURI) { -+ SYNC_VM_REGS_SCOPED(); - if (name.empty() || namespaceURI.empty()) { - raise_warning("Attribute Name and Namespace URI cannot be empty"); - return false; -@@ -335,6 +345,7 @@ Variant c_XMLReader::t_getattributens(const String& name, const String& namespac - } - - bool c_XMLReader::t_movetoattribute(const String& name) { -+ SYNC_VM_REGS_SCOPED(); - if (name.empty()) { - raise_warning("Attribute Name is required"); - return false; -@@ -350,6 +361,7 @@ bool c_XMLReader::t_movetoattribute(const String& name) { - } - - bool c_XMLReader::t_movetoattributeno(int64_t index) { -+ SYNC_VM_REGS_SCOPED(); - if (m_ptr) { - int ret = xmlTextReaderMoveToAttributeNo(m_ptr, index); - if (ret == 1) { -@@ -360,6 +372,7 @@ bool c_XMLReader::t_movetoattributeno(int64_t index) { - } - - bool c_XMLReader::t_movetoattributens(const String& name, const String& namespaceURI) { -+ SYNC_VM_REGS_SCOPED(); - if (name.empty() || namespaceURI.empty()) { - raise_warning("Attribute Name and Namespace URI cannot be empty"); - return false; -@@ -408,6 +421,7 @@ Variant c_XMLReader::t_lookupnamespace(const String& prefix) { - } - - bool c_XMLReader::t_setschema(const String& source) { -+ SYNC_VM_REGS_SCOPED(); - if (source.empty()) { - raise_warning("Schema data source is required"); - return false; -@@ -436,6 +450,7 @@ bool c_XMLReader::t_setparserproperty(int64_t property, bool value) { - } - - bool c_XMLReader::set_relaxng_schema(String source, int type) { -+ SYNC_VM_REGS_SCOPED(); - if (source.empty()) { - raise_warning("Schema data source is required"); - return false; -@@ -582,6 +597,7 @@ Variant c_XMLReader::t___get(Variant name) { - Variant c_XMLReader::t_expand(const Object& basenode /* = null */) { - p_DOMDocument doc; - xmlDocPtr docp = nullptr; -+ SYNC_VM_REGS_SCOPED(); - - if (!basenode.isNull()) { - c_DOMNode *dombasenode = basenode.getTyped<c_DOMNode>(); -diff --git a/hphp/runtime/ext/libxml/ext_libxml.cpp b/hphp/runtime/ext/libxml/ext_libxml.cpp -index 277d8ec..7dada55 100644 ---- a/hphp/runtime/ext/libxml/ext_libxml.cpp -+++ b/hphp/runtime/ext/libxml/ext_libxml.cpp -@@ -17,9 +17,13 @@ - - #include "hphp/runtime/ext/libxml/ext_libxml.h" - -+#include "hphp/runtime/base/file-stream-wrapper.h" -+#include "hphp/runtime/base/file.h" - #include "hphp/runtime/base/request-event-handler.h" - #include "hphp/runtime/base/request-local.h" -+#include "hphp/runtime/base/stream-wrapper-registry.h" - #include "hphp/runtime/base/zend-url.h" -+#include "hphp/runtime/ext/ext_file.h" - - #include <libxml/parserInternals.h> - #include <libxml/tree.h> -@@ -31,10 +35,13 @@ - #include <libxml/xmlschemas.h> - #endif - --namespace HPHP { -+#include <memory> -+#include <cstring> - --static xmlParserInputBufferPtr --libxml_input_buffer(const char *URI, xmlCharEncoding enc); -+TRACE_SET_MOD(libxml); -+ -+namespace HPHP { -+/////////////////////////////////////////////////////////////////////////////// - - class xmlErrorVec : public std::vector<xmlError> { - public: -@@ -44,13 +51,13 @@ class xmlErrorVec : public std::vector<xmlError> { - - void reset() { - clearErrors(); -- xmlErrorVec().swap(*this); -+ clear(); - } - - private: - void clearErrors() { -- for (int64_t i = 0; i < size(); i++) { -- xmlResetError(&at(i)); -+ for (auto& error : *this) { -+ xmlResetError(&error); - } - } - }; -@@ -60,21 +67,24 @@ struct LibXmlRequestData final : RequestEventHandler { - m_use_error = false; - m_errors.reset(); - m_entity_loader_disabled = false; -+ m_streams_context = uninit_null(); - } - - void requestShutdown() override { - m_use_error = false; - m_errors.reset(); -+ m_streams_context = uninit_null(); - } - - bool m_entity_loader_disabled; - bool m_use_error; - xmlErrorVec m_errors; -+ Variant m_streams_context; - }; - - IMPLEMENT_STATIC_REQUEST_LOCAL(LibXmlRequestData, tl_libxml_request_data); - --static Class * s_LibXMLError_class; -+static Class* s_LibXMLError_class; - - const StaticString - s_LibXMLError("LibXMLError"), -@@ -111,6 +121,183 @@ const StaticString - s_LIBXML_ERR_ERROR("LIBXML_ERR_ERROR"), - s_LIBXML_ERR_FATAL("LIBXML_ERR_FATAL"); - -+/////////////////////////////////////////////////////////////////////////////// -+// Callbacks and helpers -+// -+// Note that these stream callbacks may re-enter the VM via a user-defined -+// stream wrapper. The VM state should be synced using VMRegAnchor by the -+// caller, before entering libxml2. -+ -+static Resource libxml_streams_IO_open_wrapper( -+ const char *filename, const char* mode, bool read_only) -+{ -+ ITRACE(1, "libxml_open_wrapper({}, {}, {})\n", filename, mode, read_only); -+ Trace::Indent _i; -+ -+ String strFilename = StringData::Make(filename, CopyString); -+ /* FIXME: PHP calls stat() here if the wrapper has a non-null stat handler, -+ * in order to skip the open of a missing file, thus suppressing warnings. -+ * Our stat handlers are virtual, so there's no easy way to tell if stat -+ * is supported, so instead we will just call stat() for plain files, since -+ * of the default transports, only plain files have support for stat(). -+ */ -+ if (read_only) { -+ int pathIndex = 0; -+ Stream::Wrapper * wrapper = Stream::getWrapperFromURI(strFilename, -+ &pathIndex); -+ if (dynamic_cast<FileStreamWrapper*>(wrapper)) { -+ if (!f_file_exists(strFilename)) { -+ return Resource(); -+ } -+ } -+ } -+ -+ // PHP unescapes the URI here, but that should properly be done by the -+ // wrapper. The wrapper should expect a valid URI, e.g. file:///foo%20bar -+ return File::Open(strFilename, mode, 0, -+ tl_libxml_request_data->m_streams_context); -+} -+ -+int libxml_streams_IO_read(void* context, char* buffer, int len) { -+ ITRACE(1, "libxml_IO_read({}, {}, {})\n", context, (void*)buffer, len); -+ Trace::Indent _i; -+ -+ Resource stream(static_cast<ResourceData*>(context)); -+ assert(len >= 0); -+ Variant ret = f_fread(stream, len); -+ if (ret.isString()) { -+ const String& str = ret.asCStrRef(); -+ if (str.size() <= len) { -+ std::memcpy(buffer, str.data(), str.size()); -+ return str.size(); -+ } -+ } -+ -+ return -1; -+} -+ -+int libxml_streams_IO_write(void* context, const char* buffer, int len) { -+ ITRACE(1, "libxml_IO_write({}, {}, {})\n", context, (void*)buffer, len); -+ Trace::Indent _i; -+ -+ Resource stream(static_cast<ResourceData*>(context)); -+ String strBuffer(StringData::Make(buffer, len, CopyString)); -+ Variant ret = f_fwrite(stream, strBuffer); -+ if (ret.isInteger() && ret.asInt64Val() < INT_MAX) { -+ return (int)ret.asInt64Val(); -+ } else { -+ return -1; -+ } -+} -+ -+int libxml_streams_IO_close(void* context) { -+ ITRACE(1, "libxml_IO_close({}), sweeping={}\n", -+ context, MemoryManager::sweeping()); -+ Trace::Indent _i; -+ -+ if (MemoryManager::sweeping()) { -+ // Stream wrappers close themselves on sweep, so there's nothing to do here -+ return 0; -+ } -+ -+ Resource stream(static_cast<ResourceData*>(context)); -+ // Release the reference owned by context. Guaranteed to not go to zero since -+ // we just created one belonging to stream. -+ stream.get()->decRefCount(); -+ -+ return f_fclose(stream) ? 0 : -1; -+} -+ -+static xmlExternalEntityLoader s_default_entity_loader = nullptr; -+ -+/* -+ * A whitelist of protocols allowed to be use in xml external entities. Note -+ * that accesses to this set are not synchronized, so it must not be modified -+ * after module initialization. -+ */ -+static std::unordered_set< -+ const StringData*, -+ string_data_hash, -+ string_data_isame -+> s_ext_entity_whitelist; -+ -+static bool allow_ext_entity_protocol(const String& protocol) { -+ return s_ext_entity_whitelist.count(protocol.get()); -+} -+ -+static xmlParserInputPtr libxml_ext_entity_loader(const char *url, -+ const char *id, -+ xmlParserCtxtPtr context) { -+ ITRACE(1, "libxml_ext_entity_loader({}, {}, {})\n", -+ url, id, (void*)context); -+ Trace::Indent _i; -+ -+ auto protocol = Stream::getWrapperProtocol(url); -+ if (!allow_ext_entity_protocol(protocol)) { -+ raise_warning("Protocol '%s' for external XML entity '%s' is disabled for" -+ " security reasons. This may be changed using the" -+ " hhvm.libxml.ext_entity_whitelist ini setting.", -+ protocol.c_str(), url); -+ return nullptr; -+ } -+ -+ return s_default_entity_loader(url, id, context); -+} -+ -+static xmlParserInputBufferPtr -+libxml_create_input_buffer(const char* URI, xmlCharEncoding enc) { -+ ITRACE(1, "libxml_create_input_buffer({}, {})\n", URI, static_cast<int>(enc)); -+ Trace::Indent _i; -+ -+ if (tl_libxml_request_data->m_entity_loader_disabled || !URI) return nullptr; -+ -+ Resource stream = libxml_streams_IO_open_wrapper(URI, "rb", true); -+ if (stream.isInvalid()) return nullptr; -+ -+ // Allocate the Input buffer front-end. -+ xmlParserInputBufferPtr ret = xmlAllocParserInputBuffer(enc); -+ if (ret != nullptr) { -+ stream.get()->incRefCount(); -+ ret->context = stream.get(); -+ ret->readcallback = libxml_streams_IO_read; -+ ret->closecallback = libxml_streams_IO_close; -+ } -+ -+ return ret; -+} -+ -+static xmlOutputBufferPtr -+libxml_create_output_buffer(const char *URI, -+ xmlCharEncodingHandlerPtr encoder, -+ int compression ATTRIBUTE_UNUSED) -+{ -+ ITRACE(1, "libxml_create_output_buffer({}, {}, {})\n", -+ URI, (void*)encoder, compression); -+ Trace::Indent _i; -+ -+ if (URI == nullptr) { -+ return nullptr; -+ } -+ // PHP unescapes the URI here, but that should properly be done by the -+ // wrapper. The wrapper should expect a valid URI, e.g. file:///foo%20bar -+ Resource stream = libxml_streams_IO_open_wrapper(URI, "wb", false); -+ if (stream.isInvalid()) { -+ return nullptr; -+ } -+ // Allocate the Output buffer front-end. -+ xmlOutputBufferPtr ret = xmlAllocOutputBuffer(encoder); -+ if (ret != nullptr) { -+ stream.get()->incRefCount(); -+ ret->context = stream.get(); -+ ret->writecallback = libxml_streams_IO_write; -+ ret->closecallback = libxml_streams_IO_close; -+ } -+ -+ return ret; -+} -+ -+/////////////////////////////////////////////////////////////////////////////// -+ - bool libxml_use_internal_error() { - return tl_libxml_request_data->m_use_error; - } -@@ -325,14 +512,6 @@ bool HHVM_FUNCTION(libxml_use_internal_errors, bool use_errors) { - return ret; - } - --static xmlParserInputBufferPtr --libxml_input_buffer(const char *URI, xmlCharEncoding enc) { -- if (tl_libxml_request_data->m_entity_loader_disabled) { -- return nullptr; -- } -- return __xmlParserInputBufferCreateFilename(URI, enc); --} -- - bool HHVM_FUNCTION(libxml_disable_entity_loader, bool disable /* = true */) { - bool old = tl_libxml_request_data->m_entity_loader_disabled; - -@@ -341,6 +520,13 @@ bool HHVM_FUNCTION(libxml_disable_entity_loader, bool disable /* = true */) { - return old; - } - -+void HHVM_FUNCTION(libxml_set_streams_context, const Resource & context) { -+ tl_libxml_request_data->m_streams_context = context; -+} -+ -+/////////////////////////////////////////////////////////////////////////////// -+// Extension -+ - class LibXMLExtension : public Extension { - public: - LibXMLExtension() : Extension("libxml") {} -@@ -356,6 +542,22 @@ class LibXMLExtension : public Extension { - name.get(), StaticString(value).get()); - } - -+ void moduleLoad(const IniSetting::Map& ini, Hdf config) override { -+ Hdf libxml = config["Eval"]["Libxml"]; -+ -+ // Grab the external entity whitelist and set up the map, then register -+ // the callback for external entity loading. data: is always supported -+ // since it doesn't reference data outside of the current document. -+ std::vector<std::string> whitelist; -+ auto whitelistStr = Config::GetString(ini, libxml["ExtEntityWhitelist"]); -+ folly::split(',', whitelistStr, whitelist, true); -+ -+ s_ext_entity_whitelist.insert(makeStaticString("data")); -+ for (auto const& str : whitelist) { -+ s_ext_entity_whitelist.insert(makeStaticString(str)); -+ } -+ } -+ - void moduleInit() override { - cnsInt(s_LIBXML_VERSION, LIBXML_VERSION); - cnsStr(s_LIBXML_DOTTED_VERSION, LIBXML_DOTTED_VERSION); -@@ -404,11 +606,18 @@ class LibXMLExtension : public Extension { - HHVM_FE(libxml_clear_errors); - HHVM_FE(libxml_use_internal_errors); - HHVM_FE(libxml_disable_entity_loader); -+ HHVM_FE(libxml_set_streams_context); - - loadSystemlib(); - - s_LibXMLError_class = Unit::lookupClass(s_LibXMLError.get()); -- xmlParserInputBufferCreateFilenameDefault(libxml_input_buffer); -+ -+ // Set up callbacks to support stream wrappers for reading and writing -+ // xml files and loading external entities. -+ xmlParserInputBufferCreateFilenameDefault(libxml_create_input_buffer); -+ xmlOutputBufferCreateFilenameDefault(libxml_create_output_buffer); -+ s_default_entity_loader = xmlGetExternalEntityLoader(); -+ xmlSetExternalEntityLoader(libxml_ext_entity_loader); - } - - void requestInit() override { -diff --git a/hphp/runtime/ext/libxml/ext_libxml.h b/hphp/runtime/ext/libxml/ext_libxml.h -index a19231d..7634b02 100644 ---- a/hphp/runtime/ext/libxml/ext_libxml.h -+++ b/hphp/runtime/ext/libxml/ext_libxml.h -@@ -19,6 +19,7 @@ - #define incl_HPHP_EXT_LIBXML_H_ - - #include "hphp/runtime/base/base-includes.h" -+ - #include <libxml/parser.h> - - namespace HPHP { -@@ -29,6 +30,9 @@ void libxml_add_error(const std::string& msg); - String libxml_get_valid_file_path(const String& source); - String libxml_get_valid_file_path(const char* source); - -+int libxml_streams_IO_read(void* context, char* buffer, int len); -+int libxml_streams_IO_write(void* context, const char* buffer, int len); -+int libxml_streams_IO_close(void* context); - - void php_libxml_node_free(xmlNodePtr node); - void php_libxml_node_free_resource(xmlNodePtr node); -diff --git a/hphp/runtime/ext/libxml/ext_libxml.php b/hphp/runtime/ext/libxml/ext_libxml.php -index 9e54afa..eb3cec7 100644 ---- a/hphp/runtime/ext/libxml/ext_libxml.php -+++ b/hphp/runtime/ext/libxml/ext_libxml.php -@@ -30,3 +30,7 @@ function libxml_use_internal_errors(bool $use_errors = false): bool; - /* Disable/enable the ability to load external entities. */ - <<__Native>> - function libxml_disable_entity_loader(bool $disable = true): bool; -+ -+/* Set the streams context for the next libxml document load or write */ -+<<__Native>> -+function libxml_set_streams_context(resource $context): void; -diff --git a/hphp/runtime/ext/stream/ext_stream.cpp b/hphp/runtime/ext/stream/ext_stream.cpp -index 7c422c0..af0ae58 100644 ---- a/hphp/runtime/ext/stream/ext_stream.cpp -+++ b/hphp/runtime/ext/stream/ext_stream.cpp -@@ -58,7 +58,9 @@ static StreamContext* get_stream_context(const Variant& stream_or_context); - Variant f_stream_context_create(const Array& options /* = null_array */, - const Array& params /* = null_array */) { - if (!options.isNull() && !StreamContext::validateOptions(options)) { -- return false; -+ raise_warning("options should have the form " -+ "[\"wrappername\"][\"optionname\"] = $value"); -+ return Resource(NEWOBJ(StreamContext)(HPHP::null_array, HPHP::null_array)); - } - return Resource(NEWOBJ(StreamContext)(options, params)); - } -diff --git a/hphp/runtime/ext/xsl/ext_xsl.cpp b/hphp/runtime/ext/xsl/ext_xsl.cpp -index 1061fb0..4218ab6 100644 ---- a/hphp/runtime/ext/xsl/ext_xsl.cpp -+++ b/hphp/runtime/ext/xsl/ext_xsl.cpp -@@ -469,6 +469,7 @@ static void HHVM_METHOD(XSLTProcessor, importStylesheet, - if (doc) { - data->m_stylesheet = xsltParseStylesheetDoc(doc); - if (data->m_stylesheet == nullptr) { -+ xmlFreeDoc(doc); - raise_error("Unable to import stylesheet"); - } - } -diff --git a/hphp/test/quick/xml_entity_loader.php b/hphp/test/quick/xml_entity_loader.php -new file mode 100644 -index 0000000..b95592e ---- /dev/null -+++ b/hphp/test/quick/xml_entity_loader.php -@@ -0,0 +1,15 @@ -+<?php -+ -+$doc = new DOMDocument(); -+$doc->loadXML( -+'<?xml version="1.0" encoding="UTF-8" ?> -+<!DOCTYPE root [ -+ <!ENTITY test SYSTEM "data:text/plain;base64,aGVsbG8gd29ybGQ="> -+]> -+<root>&test;</root>', -+LIBXML_DTDLOAD | LIBXML_NOENT -+); -+ -+var_dump($doc->textContent); -+ -+?> -diff --git a/hphp/test/quick/xml_entity_loader.php.expect b/hphp/test/quick/xml_entity_loader.php.expect -new file mode 100644 -index 0000000..d4a0bb6 ---- /dev/null -+++ b/hphp/test/quick/xml_entity_loader.php.expect -@@ -0,0 +1 @@ -+string(11) "hello world" -diff --git a/hphp/test/slow/dom_document/xinclude.php.ini b/hphp/test/slow/dom_document/xinclude.php.ini -new file mode 100644 -index 0000000..be9eec1 ---- /dev/null -+++ b/hphp/test/slow/dom_document/xinclude.php.ini -@@ -0,0 +1 @@ -+hhvm.libxml.ext_entity_whitelist = "file" -diff --git a/hphp/test/tools/import_zend_test.py b/hphp/test/tools/import_zend_test.py -index 8af016b..50233ce 100755 ---- a/hphp/test/tools/import_zend_test.py -+++ b/hphp/test/tools/import_zend_test.py -@@ -181,7 +181,6 @@ - '/ext/xsl/tests/bug49634.php', - '/ext/xsl/tests/bug54446_with_ini.php', - '/ext/xsl/tests/xsl-phpinfo.php', -- '/ext/xsl/tests/xslt008.php', - '/ext/xsl/tests/xslt009.php', - '/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.php', - '/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.php', -diff --git a/hphp/test/zend/bad/ext/libxml/tests/004.php b/hphp/test/zend/bad/ext/libxml/tests/004.php -deleted file mode 100644 -index beb04b9..0000000 ---- a/hphp/test/zend/bad/ext/libxml/tests/004.php -+++ /dev/null -@@ -1,23 +0,0 @@ --<?php -- --$ctxs = array( -- NULL, -- 'bogus', -- 123, -- new stdclass, -- array('a'), -- stream_context_create(), -- stream_context_create(array('file')), -- stream_context_create(array('file' => array('some_opt' => 'aaa'))) --); -- -- --foreach ($ctxs as $ctx) { -- var_dump(libxml_set_streams_context($ctx)); -- $dom = new DOMDocument(); -- var_dump($dom->load(dirname(__FILE__).'/test.xml')); --} -- --echo "Done\n"; -- --?> -\ No newline at end of file -diff --git a/hphp/test/zend/bad/ext/libxml/tests/004.php.expectf b/hphp/test/zend/bad/ext/libxml/tests/004.php.expectf -deleted file mode 100644 -index 93e3a98..0000000 ---- a/hphp/test/zend/bad/ext/libxml/tests/004.php.expectf -+++ /dev/null -@@ -1,29 +0,0 @@ -- --Warning: %s -- --Warning: %s --NULL --bool(true) -- --Warning: %s --NULL --bool(true) -- --Warning: %s --NULL --bool(true) -- --Warning: %s --NULL --bool(true) -- --Warning: %s --NULL --bool(true) --NULL --bool(true) --NULL --bool(true) --NULL --bool(true) --Done -\ No newline at end of file -diff --git a/hphp/test/zend/bad/ext/libxml/tests/bug63389.php b/hphp/test/zend/bad/ext/libxml/tests/bug63389.php -deleted file mode 100644 -index 0652e12..0000000 ---- a/hphp/test/zend/bad/ext/libxml/tests/bug63389.php -+++ /dev/null -@@ -1,6 +0,0 @@ --<?php --$fp = fopen("php://input", "r"); --libxml_set_streams_context($fp); --libxml_set_streams_context("a"); --echo "okey"; --?> -\ No newline at end of file -diff --git a/hphp/test/zend/bad/ext/libxml/tests/bug63389.php.expectf b/hphp/test/zend/bad/ext/libxml/tests/bug63389.php.expectf -deleted file mode 100644 -index 2e6f303..0000000 ---- a/hphp/test/zend/bad/ext/libxml/tests/bug63389.php.expectf -+++ /dev/null -@@ -1,3 +0,0 @@ -- --Warning: %s --okey -\ No newline at end of file -diff --git a/hphp/test/zend/bad/ext/xsl/tests/xslt008.php b/hphp/test/zend/bad/ext/xsl/tests/xslt008.php -deleted file mode 100644 -index e3a33d5..0000000 ---- a/hphp/test/zend/bad/ext/xsl/tests/xslt008.php -+++ /dev/null -@@ -1,14 +0,0 @@ --<?php --echo "Test 8: Stream Wrapper Includes "; --include("prepare.inc"); --$xsl = new domDocument; --$xsl->load(dirname(__FILE__)."/streamsinclude.xsl"); --if(!$xsl) { -- echo "Error while parsing the document\n"; -- exit; --} --chdir(dirname(__FILE__)); --$proc->importStylesheet($xsl); --print "\n"; --print $proc->transformToXML($dom); -- -diff --git a/hphp/test/zend/bad/ext/xsl/tests/xslt008.php.expectf b/hphp/test/zend/bad/ext/xsl/tests/xslt008.php.expectf -deleted file mode 100644 -index 44d3a54..0000000 ---- a/hphp/test/zend/bad/ext/xsl/tests/xslt008.php.expectf -+++ /dev/null -@@ -1,7 +0,0 @@ --Test 8: Stream Wrapper Includes --<?xml version="1.0" encoding="iso-8859-1"?> --<html><body>bar --a1 b1 c1 <br/> --a2 c2 <br/> --ä3 b3 c3 <br/> --</body></html> -\ No newline at end of file -diff --git a/hphp/test/zend/bad/ext/xsl/tests/xslt008.php.skipif b/hphp/test/zend/bad/ext/xsl/tests/xslt008.php.skipif -deleted file mode 100644 -index 40e4048..0000000 ---- a/hphp/test/zend/bad/ext/xsl/tests/xslt008.php.skipif -+++ /dev/null -@@ -1,4 +0,0 @@ --<?php -- require_once dirname(__FILE__) .'/skipif.inc'; -- if (!extension_loaded('zlib')) die('skip zlib extension not available'); --?> -\ No newline at end of file -diff --git a/hphp/test/zend/good/ext/libxml/tests/004.php b/hphp/test/zend/good/ext/libxml/tests/004.php -new file mode 100644 -index 0000000..beb04b9 ---- /dev/null -+++ b/hphp/test/zend/good/ext/libxml/tests/004.php -@@ -0,0 +1,23 @@ -+<?php -+ -+$ctxs = array( -+ NULL, -+ 'bogus', -+ 123, -+ new stdclass, -+ array('a'), -+ stream_context_create(), -+ stream_context_create(array('file')), -+ stream_context_create(array('file' => array('some_opt' => 'aaa'))) -+); -+ -+ -+foreach ($ctxs as $ctx) { -+ var_dump(libxml_set_streams_context($ctx)); -+ $dom = new DOMDocument(); -+ var_dump($dom->load(dirname(__FILE__).'/test.xml')); -+} -+ -+echo "Done\n"; -+ -+?> -\ No newline at end of file -diff --git a/hphp/test/zend/good/ext/libxml/tests/004.php.expectf b/hphp/test/zend/good/ext/libxml/tests/004.php.expectf -new file mode 100644 -index 0000000..93e3a98 ---- /dev/null -+++ b/hphp/test/zend/good/ext/libxml/tests/004.php.expectf -@@ -0,0 +1,29 @@ -+ -+Warning: %s -+ -+Warning: %s -+NULL -+bool(true) -+ -+Warning: %s -+NULL -+bool(true) -+ -+Warning: %s -+NULL -+bool(true) -+ -+Warning: %s -+NULL -+bool(true) -+ -+Warning: %s -+NULL -+bool(true) -+NULL -+bool(true) -+NULL -+bool(true) -+NULL -+bool(true) -+Done -\ No newline at end of file -diff --git a/hphp/test/zend/good/ext/libxml/tests/bug63389.php b/hphp/test/zend/good/ext/libxml/tests/bug63389.php -new file mode 100644 -index 0000000..0652e12 ---- /dev/null -+++ b/hphp/test/zend/good/ext/libxml/tests/bug63389.php -@@ -0,0 +1,6 @@ -+<?php -+$fp = fopen("php://input", "r"); -+libxml_set_streams_context($fp); -+libxml_set_streams_context("a"); -+echo "okey"; -+?> -\ No newline at end of file -diff --git a/hphp/test/zend/good/ext/libxml/tests/bug63389.php.expectf b/hphp/test/zend/good/ext/libxml/tests/bug63389.php.expectf -new file mode 100644 -index 0000000..2e6f303 ---- /dev/null -+++ b/hphp/test/zend/good/ext/libxml/tests/bug63389.php.expectf -@@ -0,0 +1,3 @@ -+ -+Warning: %s -+okey -\ No newline at end of file -diff --git a/hphp/test/zend/good/ext/libxml/tests/libxml_disable_entity_loader.php.ini b/hphp/test/zend/good/ext/libxml/tests/libxml_disable_entity_loader.php.ini -new file mode 100644 -index 0000000..be9eec1 ---- /dev/null -+++ b/hphp/test/zend/good/ext/libxml/tests/libxml_disable_entity_loader.php.ini -@@ -0,0 +1 @@ -+hhvm.libxml.ext_entity_whitelist = "file" -diff --git a/hphp/test/zend/good/ext/libxml/tests/test.xml b/hphp/test/zend/good/ext/libxml/tests/test.xml -new file mode 100644 -index 0000000..fc1d328 ---- /dev/null -+++ b/hphp/test/zend/good/ext/libxml/tests/test.xml -@@ -0,0 +1,8 @@ -+<library> -+ <book> -+ <title>PHP made simple</title> -+ </book> -+ <book> -+ <title>learn PHP easily</title> -+ </book> -+</library> -diff --git a/hphp/test/zend/good/ext/xmlreader/tests/007.php.ini b/hphp/test/zend/good/ext/xmlreader/tests/007.php.ini -new file mode 100644 -index 0000000..be9eec1 ---- /dev/null -+++ b/hphp/test/zend/good/ext/xmlreader/tests/007.php.ini -@@ -0,0 +1 @@ -+hhvm.libxml.ext_entity_whitelist = "file" -diff --git a/hphp/test/zend/good/ext/xmlreader/tests/008.php.ini b/hphp/test/zend/good/ext/xmlreader/tests/008.php.ini -new file mode 100644 -index 0000000..be9eec1 ---- /dev/null -+++ b/hphp/test/zend/good/ext/xmlreader/tests/008.php.ini -@@ -0,0 +1 @@ -+hhvm.libxml.ext_entity_whitelist = "file" -diff --git a/hphp/test/zend/good/ext/xmlreader/tests/012.php.ini b/hphp/test/zend/good/ext/xmlreader/tests/012.php.ini -new file mode 100644 -index 0000000..be9eec1 ---- /dev/null -+++ b/hphp/test/zend/good/ext/xmlreader/tests/012.php.ini -@@ -0,0 +1 @@ -+hhvm.libxml.ext_entity_whitelist = "file" -diff --git a/hphp/test/zend/good/ext/xsl/tests/bug53965.php b/hphp/test/zend/good/ext/xsl/tests/bug53965.php -new file mode 100644 -index 0000000..2450b3c ---- /dev/null -+++ b/hphp/test/zend/good/ext/xsl/tests/bug53965.php -@@ -0,0 +1,15 @@ -+<?php -+ -+$base = 'file://' . dirname(__FILE__) . DIRECTORY_SEPARATOR . '53965'; -+ -+$xml = new DOMDocument(); -+$xml->load($base . DIRECTORY_SEPARATOR . 'collection.xml'); -+ -+$xsl = new DOMDocument(); -+$xsl->load($base . DIRECTORY_SEPARATOR . 'collection.xsl'); -+ -+$proc = new XSLTProcessor; -+$proc->importStyleSheet($xsl); -+ -+echo $proc->transformToXML($xml); -+?> -\ No newline at end of file -diff --git a/hphp/test/zend/good/ext/xsl/tests/bug53965.php.expectf b/hphp/test/zend/good/ext/xsl/tests/bug53965.php.expectf -new file mode 100644 -index 0000000..01153ed ---- /dev/null -+++ b/hphp/test/zend/good/ext/xsl/tests/bug53965.php.expectf -@@ -0,0 +1,4 @@ -+Hey! Welcome to Nicolas Eliaszewicz's sweet CD collection! -+ -+ <h1>Fight for your mind</h1><h2>by Ben Harper - 1995</h2><hr> -+ <h1>Electric Ladyland</h1><h2>by Jimi Hendrix - 1997</h2><hr> -\ No newline at end of file -diff --git a/hphp/test/zend/good/ext/xsl/tests/bug53965.php.ini b/hphp/test/zend/good/ext/xsl/tests/bug53965.php.ini -new file mode 100644 -index 0000000..be9eec1 ---- /dev/null -+++ b/hphp/test/zend/good/ext/xsl/tests/bug53965.php.ini -@@ -0,0 +1 @@ -+hhvm.libxml.ext_entity_whitelist = "file" -diff --git a/hphp/test/zend/good/ext/xsl/tests/bug53965.php.skipif b/hphp/test/zend/good/ext/xsl/tests/bug53965.php.skipif -new file mode 100644 -index 0000000..6e87d2c ---- /dev/null -+++ b/hphp/test/zend/good/ext/xsl/tests/bug53965.php.skipif -@@ -0,0 +1,3 @@ -+<?php -+if (!extension_loaded('xsl')) die("skip Extension XSL is required\n"); -+?> -\ No newline at end of file -diff --git a/hphp/test/zend/good/ext/xsl/tests/xslt008-disabled.php b/hphp/test/zend/good/ext/xsl/tests/xslt008-disabled.php -new file mode 100644 -index 0000000..e3a33d5 ---- /dev/null -+++ b/hphp/test/zend/good/ext/xsl/tests/xslt008-disabled.php -@@ -0,0 +1,14 @@ -+<?php -+echo "Test 8: Stream Wrapper Includes "; -+include("prepare.inc"); -+$xsl = new domDocument; -+$xsl->load(dirname(__FILE__)."/streamsinclude.xsl"); -+if(!$xsl) { -+ echo "Error while parsing the document\n"; -+ exit; -+} -+chdir(dirname(__FILE__)); -+$proc->importStylesheet($xsl); -+print "\n"; -+print $proc->transformToXML($dom); -+ -diff --git a/hphp/test/zend/good/ext/xsl/tests/xslt008-disabled.php.expectf b/hphp/test/zend/good/ext/xsl/tests/xslt008-disabled.php.expectf -new file mode 100644 -index 0000000..ef7bff2 ---- /dev/null -+++ b/hphp/test/zend/good/ext/xsl/tests/xslt008-disabled.php.expectf -@@ -0,0 +1,8 @@ -+Test 8: Stream Wrapper Includes -+Warning: Protocol 'compress.zlib' for external XML entity 'compress.zlib://xslt.xsl.gz' is disabled for security reasons. This may be changed using the hhvm.libxml.ext_entity_whitelist ini setting. in %s/tests/xslt008-disabled.php on line 11 -+ -+Warning: compilation error: file %s/streamsinclude.xsl line 5 element include in %s/xslt008-disabled.php on line 11 -+ -+Warning: xsl:include : unable to load compress.zlib://xslt.xsl.gz in %s/xslt008-disabled.php on line 11 -+ -+Fatal error: Unable to import stylesheet in %s/xslt008-disabled.php on line 11 -\ No newline at end of file -diff --git a/hphp/test/zend/good/ext/xsl/tests/xslt008.php b/hphp/test/zend/good/ext/xsl/tests/xslt008.php -new file mode 100644 -index 0000000..e3a33d5 ---- /dev/null -+++ b/hphp/test/zend/good/ext/xsl/tests/xslt008.php -@@ -0,0 +1,14 @@ -+<?php -+echo "Test 8: Stream Wrapper Includes "; -+include("prepare.inc"); -+$xsl = new domDocument; -+$xsl->load(dirname(__FILE__)."/streamsinclude.xsl"); -+if(!$xsl) { -+ echo "Error while parsing the document\n"; -+ exit; -+} -+chdir(dirname(__FILE__)); -+$proc->importStylesheet($xsl); -+print "\n"; -+print $proc->transformToXML($dom); -+ -diff --git a/hphp/test/zend/good/ext/xsl/tests/xslt008.php.expectf b/hphp/test/zend/good/ext/xsl/tests/xslt008.php.expectf -new file mode 100644 -index 0000000..44d3a54 ---- /dev/null -+++ b/hphp/test/zend/good/ext/xsl/tests/xslt008.php.expectf -@@ -0,0 +1,7 @@ -+Test 8: Stream Wrapper Includes -+<?xml version="1.0" encoding="iso-8859-1"?> -+<html><body>bar -+a1 b1 c1 <br/> -+a2 c2 <br/> -+ä3 b3 c3 <br/> -+</body></html> -\ No newline at end of file -diff --git a/hphp/test/zend/good/ext/xsl/tests/xslt008.php.ini b/hphp/test/zend/good/ext/xsl/tests/xslt008.php.ini -new file mode 100644 -index 0000000..661e5c1 ---- /dev/null -+++ b/hphp/test/zend/good/ext/xsl/tests/xslt008.php.ini -@@ -0,0 +1 @@ -+hhvm.libxml.ext_entity_whitelist = "compress.zlib" -diff --git a/hphp/test/zend/good/ext/xsl/tests/xslt008.php.norepo b/hphp/test/zend/good/ext/xsl/tests/xslt008.php.norepo -new file mode 100644 -index 0000000..e69de29 -diff --git a/hphp/test/zend/good/ext/xsl/tests/xslt008.php.skipif b/hphp/test/zend/good/ext/xsl/tests/xslt008.php.skipif -new file mode 100644 -index 0000000..40e4048 ---- /dev/null -+++ b/hphp/test/zend/good/ext/xsl/tests/xslt008.php.skipif -@@ -0,0 +1,4 @@ -+<?php -+ require_once dirname(__FILE__) .'/skipif.inc'; -+ if (!extension_loaded('zlib')) die('skip zlib extension not available'); -+?> -\ No newline at end of file -diff --git a/hphp/util/trace.h b/hphp/util/trace.h -index ed29bef..a14b4be 100644 ---- a/hphp/util/trace.h -+++ b/hphp/util/trace.h -@@ -35,7 +35,7 @@ - * env TRACE=mcg:1,bcinterp:3,tmp0:1 ./hhvm/hhvm ... - * - * In a source file, select the compilation unit's module by calling the -- * TRACE_SET_MODE macro. E.g., -+ * TRACE_SET_MOD macro. E.g., - * - * TRACE_SET_MOD(mcg); - * -@@ -118,6 +118,7 @@ namespace Trace { - TM(intercept) \ - TM(interpOne) \ - TM(jittime) \ -+ TM(libxml) \ - TM(mcg) \ - TM(mcgstats) \ - TM(minstr) \ --- -1.9.3 - diff --git a/debian/patches/change_api_version b/debian/patches/change_api_version deleted file mode 100644 index 51858de..0000000 --- a/debian/patches/change_api_version +++ /dev/null @@ -1,19 +0,0 @@ -Description: Make HHVM_API_VERSION meaningful. - At present, HHVM devs do not update the HHVM_API_VERSION to reflect - changes in ABI compatibility, and this is a nightmare for getting - dependencies right when building extensions. So we do this - artificially to guarantee ABI compatibility. -Author: Giuseppe Lavagetto <glavage...@wikimedia.org> -Last-Update: 2014-07-30 - ---- a/hphp/runtime/ext/extension.h -+++ b/hphp/runtime/ext/extension.h -@@ -113,7 +113,7 @@ private: - std::string m_dsoName; - }; - --#define HHVM_API_VERSION 20140702L -+#define HHVM_API_VERSION 20140727L - - #ifdef HHVM_BUILD_DSO - #define HHVM_GET_MODULE(name) \ diff --git a/debian/patches/fix-sql-warning.patch b/debian/patches/fix-sql-warning.patch new file mode 100644 index 0000000..06ceead --- /dev/null +++ b/debian/patches/fix-sql-warning.patch @@ -0,0 +1,32 @@ +Description: Support DDL and empty select statements in SQL stats collection. + At the moment, any code performing one a DDL (create, alter, drop table) + and/or any code doing tableless selects (like SELECT 1; or SELECT + MASTER_LOG_POS...) will cause HHVM to issue a warning and not update the + statistics. This patch should add support for those. + +Author: Giuseppe Lavagetto <glavage...@wikimedia.org> +Forwarded: https://github.com/facebook/hhvm/pull/2085 +Last-Update: 2014-09-18 + +--- a/hphp/runtime/ext/mysql/mysql_common.cpp ++++ b/hphp/runtime/ext/mysql/mysql_common.cpp +@@ -1319,7 +1319,8 @@ MySQLQueryReturn php_mysql_do_query(const String& query, const Variant& link_id, + "(update|set|show)\\s+([^\\s\\(,]+)|" + "(replace).*?\\s+into\\s+([^\\s\\(,]+)|" + "(delete).*?\\s+from\\s+([^\\s\\(,]+)|" +- "(select).*?[\\s`]+from\\s+([^\\s\\(,]+))/is", ++ "(select).*?[\\s`]+from\\s+([^\\s\\(,]+)|" ++ "(create|alter|drop).*?\\s+table\\s+([^\\s\\(,]+))/is", + q, ref(matches)); + int size = matches.toArray().size(); + if (size > 2) { +@@ -1347,7 +1348,7 @@ MySQLQueryReturn php_mysql_do_query(const String& query, const Variant& link_id, + } + } else { + HHVM_FN(preg_match)("/^(?:(?:\\/\\*.*?\\*\\/)|\\(|\\s)*" +- "(begin|commit|rollback)/is", ++ "(begin|commit|rollback|select)/is", + query, ref(matches)); + size = matches.toArray().size(); + auto marray = matches.toArray(); + diff --git a/debian/patches/fix_fastcgi_handling b/debian/patches/fix_fastcgi_handling deleted file mode 100644 index d142938..0000000 --- a/debian/patches/fix_fastcgi_handling +++ /dev/null @@ -1,222 +0,0 @@ ---- a/hphp/runtime/server/fastcgi/fastcgi-server.cpp -+++ b/hphp/runtime/server/fastcgi/fastcgi-server.cpp -@@ -119,11 +119,13 @@ void FastCGIConnection::readDataAvailable(size_t len) noexcept { - } - - void FastCGIConnection::readEOF() noexcept { -- shutdownTransport(); -+ m_session.close(); -+ close(); - } - - void FastCGIConnection::readError(const TTransportException& ex) noexcept { -- shutdownTransport(); -+ m_session.close(); -+ close(); - } - - bool FastCGIConnection::hasReadDataAvailable() { -@@ -160,7 +162,7 @@ void FastCGIConnection::onSessionError() { - } - - void FastCGIConnection::onSessionClose() { -- shutdownTransport(); -+ close(); - m_shutdown = true; - if (m_writeCount == 0) { - delete this; -diff --git a/hphp/runtime/server/fastcgi/fastcgi-server.h b/hphp/runtime/server/fastcgi/fastcgi-server.h -index 8b7f451..f7d3d15 100644 ---- a/hphp/runtime/server/fastcgi/fastcgi-server.h -+++ b/hphp/runtime/server/fastcgi/fastcgi-server.h -@@ -72,7 +72,7 @@ class FastCGIConnection - : public SocketConnection, - public apache::thrift::async::TAsyncTransport::ReadCallback, - public apache::thrift::async::TAsyncTransport::WriteCallback, -- public ProtocolSession::Callback { -+ public FastCGISession::Callback { - friend class FastCGITransport; - public: - FastCGIConnection( -@@ -93,7 +93,7 @@ public: - newSessionHandler(int handler_id) override; - virtual void onSessionEgress(std::unique_ptr<folly::IOBuf> chain) override; - virtual void writeError(size_t bytes, -- const apache::thrift::transport::TTransportException& ex) -+ const apache::thrift::transport::TTransportException& ex) - noexcept override; - virtual void writeSuccess() noexcept override; - virtual void onSessionError() override; -diff --git a/hphp/runtime/server/fastcgi/fastcgi-session.cpp b/hphp/runtime/server/fastcgi/fastcgi-session.cpp -index 0e87a84..1341e03 100644 ---- a/hphp/runtime/server/fastcgi/fastcgi-session.cpp -+++ b/hphp/runtime/server/fastcgi/fastcgi-session.cpp -@@ -146,6 +146,10 @@ void FastCGITransaction::onComplete() { - m_session->handleComplete(m_requestId); - } - -+void FastCGITransaction::close() { -+ if (m_requestId != 0) m_handler->onBodyComplete(); -+} -+ - bool FastCGITransaction::parseKeyValue(Cursor& cursor, size_t& available) { - if (m_phase == Phase::READ_KEY_LENGTH) { - if (parseKeyValueLength(cursor, available, m_keyLength)) { -@@ -278,6 +282,12 @@ size_t FastCGISession::onIngress(const IOBuf* chain) { - return available - avail; - } - -+void FastCGISession::close() { -+ for (auto& pair : m_transactions) { -+ pair.second->close(); -+ } -+} -+ - void FastCGISession::setMaxConns(int max_conns) { - assert(max_conns > 0); - m_maxConns = max_conns; -diff --git a/hphp/runtime/server/fastcgi/fastcgi-session.h b/hphp/runtime/server/fastcgi/fastcgi-session.h -index 22dfed0..50eec99 100644 ---- a/hphp/runtime/server/fastcgi/fastcgi-session.h -+++ b/hphp/runtime/server/fastcgi/fastcgi-session.h -@@ -48,6 +48,8 @@ public: - void onStdErr(std::unique_ptr<folly::IOBuf> chain) override; - void onComplete() override; - -+ void close(); -+ - private: - enum Phase { - READ_KEY_LENGTH, -@@ -90,16 +92,31 @@ private: - }; - - --class FastCGISession : public ProtocolSession { --friend class FastCGITransaction; --public: -+struct FastCGISession { -+ friend class FastCGITransaction; -+ -+ struct Callback { -+ virtual ~Callback() {} -+ -+ virtual std::shared_ptr<ProtocolSessionHandler> -+ newSessionHandler(int handler_id) = 0; -+ virtual void onSessionEgress(std::unique_ptr<folly::IOBuf> chain) = 0; -+ virtual void onSessionError() = 0; -+ virtual void onSessionClose() = 0; -+ }; -+ - typedef FastCGITransaction Transaction; -- typedef Transaction::RequestId RequestId; -+ typedef FastCGITransaction::RequestId RequestId; - - FastCGISession(); - virtual ~FastCGISession(); - -- virtual size_t onIngress(const folly::IOBuf* chain) override; -+ size_t onIngress(const folly::IOBuf* chain); -+ void close(); -+ -+ void setCallback(Callback* callback) { -+ m_callback = callback; -+ } - - void setMaxConns(int max_conns); - void setMaxRequests(int max_requets); -@@ -252,6 +269,7 @@ protected: - int m_maxConns; - int m_maxRequests; - -+ Callback* m_callback; - TransactionMap m_transactions; - }; - -diff --git a/hphp/runtime/server/fastcgi/protocol-session.h b/hphp/runtime/server/fastcgi/protocol-session.h -index d4e7023..e06a877 100644 ---- a/hphp/runtime/server/fastcgi/protocol-session.h -+++ b/hphp/runtime/server/fastcgi/protocol-session.h -@@ -24,29 +24,16 @@ namespace HPHP { - - //////////////////////////////////////////////////////////////////////////////// - --class ProtocolSession { -+/*class ProtocolSession { - public: -- class Callback { -- public: -- virtual ~Callback() {} -- -- virtual std::shared_ptr<ProtocolSessionHandler> -- newSessionHandler(int handler_id) = 0; -- virtual void onSessionEgress(std::unique_ptr<folly::IOBuf> chain) = 0; -- virtual void onSessionError() = 0; -- virtual void onSessionClose() = 0; -- }; - - virtual ~ProtocolSession() {} - - virtual size_t onIngress(const folly::IOBuf* chain) = 0; -- void setCallback(Callback* callback) { -- m_callback = callback; -- } - - protected: - Callback* m_callback; --}; -+};*/ - - //////////////////////////////////////////////////////////////////////////////// - } -diff --git a/hphp/runtime/server/fastcgi/socket-connection.cpp b/hphp/runtime/server/fastcgi/socket-connection.cpp -index 5e19596..de6a84a 100644 ---- a/hphp/runtime/server/fastcgi/socket-connection.cpp -+++ b/hphp/runtime/server/fastcgi/socket-connection.cpp -@@ -43,14 +43,14 @@ SocketConnection::SocketConnection( - - SocketConnection::~SocketConnection() { - assert(!m_sock->getReadCallback()); -- shutdownTransport(); -+ close(); - } - - void SocketConnection::timeoutExpired() noexcept { -- shutdownTransport(); -+ close(); - } - --void SocketConnection::shutdownTransport() { -+void SocketConnection::close() { - m_sock->close(); - } - -diff --git a/hphp/runtime/server/fastcgi/socket-connection.h b/hphp/runtime/server/fastcgi/socket-connection.h -index 2f7ac2a..01125f8 100644 ---- a/hphp/runtime/server/fastcgi/socket-connection.h -+++ b/hphp/runtime/server/fastcgi/socket-connection.h -@@ -45,7 +45,7 @@ public: - virtual void dumpConnectionState(uint8_t loglevel); - - virtual bool shouldShutdown() { return false; } -- void shutdownTransport(); -+ void close(); - - protected: - apache::thrift::transport::TSocketAddress m_localAddr; -diff --git a/hphp/test/ext/test_fastcgi_protocol.cpp b/hphp/test/ext/test_fastcgi_protocol.cpp -index fdd333a..ea801ce 100644 ---- a/hphp/test/ext/test_fastcgi_protocol.cpp -+++ b/hphp/test/ext/test_fastcgi_protocol.cpp -@@ -102,7 +102,7 @@ void TestProtocolHandler::onHeadersComplete() { - - /////////////////////////////////////////////////////////////////////////////// - --class TestSessionCallback : public ProtocolSession::Callback { -+class TestSessionCallback : public FastCGISession::Callback { - public: - TestSessionCallback(); - virtual ~TestSessionCallback() {} --- -1.8.1 - diff --git a/debian/patches/fix_freetype_include b/debian/patches/fix_freetype_include deleted file mode 100644 index 872d91d..0000000 --- a/debian/patches/fix_freetype_include +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix the FreeType2 include in libgd. - The embedded libgd code has an include directory that forces the freetype - headers files to be in a freetype/ directory. -Author: David MartÃnez Moreno <en...@debian.org> -Forwarded: no -Last-Update: 2014-05-26 - ---- a/hphp/runtime/ext/gd/libgd/gdft.cpp -+++ b/hphp/runtime/ext/gd/libgd/gdft.cpp -@@ -63,7 +63,7 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist, - #include "gdcache.h" - - #ifndef HAVE_FT2BUILD --# include <freetype/config/ftheader.h> -+# include <config/ftheader.h> - #else - # include <ft2build.h> - #endif diff --git a/debian/patches/remove_libpam b/debian/patches/remove_libpam.patch similarity index 83% rename from debian/patches/remove_libpam rename to debian/patches/remove_libpam.patch index 1822005..53a2851 100644 --- a/debian/patches/remove_libpam +++ b/debian/patches/remove_libpam.patch @@ -3,8 +3,7 @@ there's no need neither in HHVM or c-client to link against libpam. Author: David MartÃnez Moreno <en...@debian.org> Forwarded: https://github.com/facebook/hhvm/pull/2085 -Last-Update: 2014-05-26 - +Last-Update: 2014-09-18 --- a/CMake/FindLibpam.cmake +++ /dev/null @@ -32,9 +31,11 @@ - PAM_INCLUDE_PATH - PAM_LIBRARY -) +diff --git a/CMake/HPHPFindLibs.cmake b/CMake/HPHPFindLibs.cmake +index e298995..7356c00 100644 --- a/CMake/HPHPFindLibs.cmake +++ b/CMake/HPHPFindLibs.cmake -@@ -327,11 +327,6 @@ if (ELF_GETSHDRSTRNDX) +@@ -331,10 +331,6 @@ if (ELF_GETSHDRSTRNDX) add_definitions("-DHAVE_ELF_GETSHDRSTRNDX") endif() @@ -42,11 +43,10 @@ -if (PAM_INCLUDE_PATH) - include_directories(${PAM_INCLUDE_PATH}) -endif() -- - FIND_LIBRARY(CRYPT_LIB NAMES xcrypt crypt crypto) - if (LINUX OR FREEBSD) - FIND_LIBRARY (RT_LIB rt) -@@ -516,10 +511,6 @@ macro(hphp_link target) + + # LLVM + find_package(LLVM) +@@ -533,10 +529,6 @@ macro(hphp_link target) target_link_libraries(${target} ${READLINE_LIBRARY}) endif() @@ -56,4 +56,4 @@ - target_link_libraries(${target} ${LIBDWARF_LIBRARIES}) target_link_libraries(${target} ${LIBELF_LIBRARIES}) - endmacro() + diff --git a/debian/patches/series b/debian/patches/series index 55f42d9..9ddd9f5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,14 +1,6 @@ -fix_freetype_include -remove_libpam -typos -change_api_version -fix_fastcgi_handling +remove_libpam.patch +typos.patch -# Wikimedia-specific patches -Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch -ExposeApiVersion - -# cherry-picks from upstream -ArrayObject-append-should-delegate-to-ArrayObject-of.patch -Fix-handling-of-pcre-overflow-expressions.patch +# Wikimedia-specific (waiting for upstream merge) Make-RUSAGE_THREAD-available-to-getrusage.patch +fix-sql-warning.patch diff --git a/debian/patches/typos b/debian/patches/typos.patch similarity index 91% rename from debian/patches/typos rename to debian/patches/typos.patch index 2c38629..7a74fe1 100644 --- a/debian/patches/typos +++ b/debian/patches/typos.patch @@ -3,7 +3,7 @@ to a lintian override file. Author: David MartÃnez Moreno <en...@debian.org> Forwarded: no -Last-Update: 2014-03-12 +Last-Update: 2014-09-18 --- a/hphp/doc/options.compiler +++ b/hphp/doc/options.compiler @@ -54,17 +54,6 @@ } *str = s+1; return STATUS_OK; ---- a/hphp/runtime/ext/ext_domdocument.cpp -+++ b/hphp/runtime/ext/ext_domdocument.cpp -@@ -415,7 +415,7 @@ static Variant dom_canonicalization(xmlN - inclusive_ns_prefixes[nscount] = NULL; - } else { - raise_notice("Inclusive namespace prefixes only allowed in " -- "exlcusive mode."); -+ "exclusive mode."); - } - } - if (mode == 1) { --- a/hphp/system/idl/stream.idl.json +++ b/hphp/system/idl/stream.idl.json @@ -359,7 +359,7 @@ @@ -129,13 +118,6 @@ // &128... will stay as they are since their character codes are above 127 // and they do not have a named entity representaion. ?> -@@ -13,4 +13,4 @@ - <?php mb_parse_str("test=&@AB€‚äöü€⟨⟩", $test); - print_r($test); - ?> --===DONE=== -\ No newline at end of file -+===DONE=== --- a/hphp/system/idl/pdo.idl.json +++ b/hphp/system/idl/pdo.idl.json @@ -1066,7 +1066,7 @@ -- To view, visit https://gerrit.wikimedia.org/r/161221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib34875196b9abfaf8208816bd3f68c6a1129443a Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
