Merge lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba

[Chris Hillery]

Added http-uri-resolution feature, default enabled. If disabled via normal option mechanism (or the convenience --disable-http-resolution command-line parameter), Zorba will not attempt to download HTTP/HTTPS/FTP URLs.

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867363-disable-http-2012-11-06T10-17-50.354Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-867363-disable-http-2012-11-06T10-17-50.354Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending.

[Markos Zaharioudakis (markos-za)]

1. I don't see the zorba cmd doing anything with the --disable-http-resolution option, if that option is actually specified in the command line.

2. If a user uses the option inside an xquery module, it will have no effect because options are processed after the imports. Such a user will then be very confused. We should probably consider moving the processing of options before the imports, but until we do this, we should throw an error if the disable-http-resolution option is encountered inside a module prolog. The error (and the documentation) should say that this option is applicable only at the C++ api.

[Markos Zaharioudakis (markos-za)]

review: Needs Fixing

[Chris Hillery (ceejatec)]

> 1. I don't see the zorba cmd doing anything with the --disable-http-resolution
> option, if that option is actually specified in the command line.

See the second diff in zorbacmdproperties_base.h. It just explicitly sets the disable-http-resolution option on the static context by using the same code as --option.

> 2. If a user uses the option inside an xquery module, it will have no effect
> because options are processed after the imports. Such a user will then be very
> confused. We should probably consider moving the processing of options before
> the imports, but until we do this, we should throw an error if the disable-
> http-resolution option is encountered inside a module prolog.

I'll implement something for this.

> The error (and
> the documentation) should say that this option is applicable only at the C++
> api.

Yes, you're right; I'll fix that too.

[Markos Zaharioudakis (markos-za)]

> > 1. I don't see the zorba cmd doing anything with the --disable-http-
> resolution
> > option, if that option is actually specified in the command line.
>
> See the second diff in zorbacmdproperties_base.h. It just explicitly sets the
> disable-http-resolution option on the static context by using the same code as
> --option.
>

Ok, I got it. But the actual update of the static context is not done in zorbacmdproperties_base.h; it is done in zorbacmd.cpp:179.

>
> > 2. If a user uses the option inside an xquery module, it will have no effect
> > because options are processed after the imports. Such a user will then be
> very
> > confused. We should probably consider moving the processing of options
> before
> > the imports, but until we do this, we should throw an error if the disable-
> > http-resolution option is encountered inside a module prolog.
>
> I'll implement something for this.
>
> > The error (and
> > the documentation) should say that this option is applicable only at the C++
> > api.
>
> Yes, you're right; I'll fix that too.

[Chris Hillery (ceejatec)]

> Ok, I got it. But the actual update of the static context is not done in
> zorbacmdproperties_base.h; it is done in zorbacmd.cpp:179.

Yes, by iterating through the options from zorbacmdproperties.. :) I did test the command-line option, it definitely does the trick. I will add a test case in bin/ to verify this.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867363-disable-http-2012-11-08T16-14-48.2Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-867363-disable-http-2012-11-08T16-14-48.2Z is
  finished. The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~zorba-coders/zorba/bug-867363-disable-http]

11129. By Chris Hillery on 2012-11-08

Fix for path of test case.

11130. By Chris Hillery on 2012-11-08

Test case for inability to set http-uri-resolution option from within
query text.

[Chris Hillery (ceejatec)]

Fixed the broken test (path oversight), and added the test case for option-in-query text (forgot to "bzr add" it before).

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867363-disable-http-2012-11-08T22-01-03.465Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-867363-disable-http-2012-11-08T22-01-03.465Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-10-29 12:31:50 +0000
+++ ChangeLog	2012-11-08 22:00:29 +0000
@@ -5,6 +5,8 @@
 
 New Features:
   * (bug #1039284) Implemented jn:json-doc().
+  * (bug #867363) Added http-uri-resolution feature to disable HTTP
+	when resolving URIs.
 
 Optimizations:
   * Various optimizations in the implementation of the optimizer rules.

=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2012-09-19 21:16:15 +0000
+++ bin/CMakeLists.txt	2012-11-08 22:00:29 +0000
@@ -93,30 +93,42 @@
 # test the --uri-path, --lib-path, and --module-path args.
 # Use the versioning tests as they utilize test modules already.
 SET (_testdir
-  "${CMAKE_CURRENT_SOURCE_DIR}/../test/rbkt/Queries/zorba/versioning")
+  "${CMAKE_CURRENT_SOURCE_DIR}/../test/rbkt/Queries/zorba")
 SET (_uridir "${CMAKE_BINARY_DIR}/TEST_URI_PATH")
 SET (_libdir "${CMAKE_BINARY_DIR}/TEST_LIB_PATH")
-ZORBA_ADD_TEST(bin/zorba_uri_path_1 zorbacmd -f -q "${_testdir}/import1.xq"
+ZORBA_ADD_TEST(bin/zorba_uri_path_1 zorbacmd
+  -f -q "${_testdir}/versioning/import1.xq"
   --uri-path "${_uridir}")
 ZORBA_SET_TEST_PROPERTY(bin/zorba_uri_path_1
   PASS_REGULAR_EXPRESSION "hello, v2")
 
-ZORBA_ADD_TEST(bin/zorba_uri_path_2 zorbacmd -f -q "${_testdir}/external1.xq"
+ZORBA_ADD_TEST(bin/zorba_uri_path_2 zorbacmd
+  -f -q "${_testdir}/versioning/external1.xq"
   --uri-path "${_uridir}")
 ZORBA_SET_TEST_PROPERTY(bin/zorba_uri_path_2
   PASS_REGULAR_EXPRESSION "ZXQP0008")
 
-ZORBA_ADD_TEST(bin/zorba_uri_path_3 zorbacmd -f -q "${_testdir}/external1.xq"
+ZORBA_ADD_TEST(bin/zorba_uri_path_3 zorbacmd
+  -f -q "${_testdir}/versioning/external1.xq"
   --uri-path "${_uridir}" --lib-path "${_libdir}")
 ZORBA_SET_TEST_PROPERTY(bin/zorba_uri_path_3
   PASS_REGULAR_EXPRESSION "hello, v2")
 
+# test the --disable-http-resolution flag, using the corresponding test query
+# from rbkt/zorba/uris/disable-http and a timeout.
+ZORBA_ADD_TEST(bin/zorba_disable_http_download zorbacmd
+  -f -q "${_testdir}/uris/disable-http.xq" --disable-http-resolution)
+ZORBA_SET_TEST_PROPERTY(bin/zorba_disable_http_download
+  PASS_REGULAR_EXPRESSION "XQST0059")
+ZORBA_SET_TEST_PROPERTY(bin/zorba_disable_http_download TIMEOUT 5)
+
 IF(WIN32)
   SET(PATH_SEP ";")
 ELSE(WIN32)
   SET(PATH_SEP ":")
 ENDIF(WIN32)
-ZORBA_ADD_TEST(bin/zorba_module_path_1 zorbacmd -f -q "${_testdir}/external1.xq"
+ZORBA_ADD_TEST(bin/zorba_module_path_1 zorbacmd
+  -f -q "${_testdir}/versioning/external1.xq"
   --module-path "${_libdir}${PATH_SEP}${_uridir}")
 ZORBA_SET_TEST_PROPERTY(bin/zorba_module_path_1
   PASS_REGULAR_EXPRESSION "hello, v2")

=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp	2012-10-10 21:15:05 +0000
+++ bin/zorbacmd.cpp	2012-11-08 22:00:29 +0000
@@ -178,10 +178,10 @@
       Item lQName = zorba->getItemFactory()->createQName(lIter->clark_qname);
       sctx->declareOption(lQName, lIter->value);
     }
-    catch (zorba::ZorbaException const& /* e */) 
+    catch (zorba::ZorbaException const& e)
     {
       std::cerr << "unable to set static context option with qname "
-                << lIter->clark_qname << std::endl;
+                << lIter->clark_qname << ": " << e.what() << std::endl;
       return false;
     }
   }
@@ -251,7 +251,8 @@
       sctx->registerURIMapper(&theThesaurusMapper);
     }
   }
-#endif
+#endif /* ZORBA_NO_FULL_TEXT */
+
   return true;
 }
 

=== modified file 'bin/zorbacmdproperties_base.h'
--- bin/zorbacmdproperties_base.h	2012-09-19 21:16:15 +0000
+++ bin/zorbacmdproperties_base.h	2012-11-08 22:00:29 +0000
@@ -42,7 +42,8 @@
       "--no-serializer", "--debug", "--debug-host", "--debug-port", "--no-logo",
       "--timeout", "--uri-path", "--lib-path", "--module-path", "--classpath",
       "--option", "--trailing-nl", "--stop-words", "--thesaurus",
-      "--compile-plan", "--execute-plan --serialize-plan", NULL };
+      "--compile-plan", "--execute-plan", "--serialize-plan",
+      "--disable-http-resolution", NULL };
     return result;
   }
 
@@ -426,6 +427,11 @@
       {
         theLoadPlan = true;
       }
+      else if (strcmp (*argv, "--disable-http-resolution") == 0)
+      {
+        init_val ("{http://www.zorba-xquery.com/options/features}disable=http-uri-resolution",
+                  theOption, 0);
+      }
       else if (strcmp (*argv, "--") == 0)
       {
         copy_args (++argv);
@@ -489,6 +495,7 @@
         "--serialize-plan, -s\nSerialize and then load the query execution plan.\n\n"
         "--compile-plan,\nDo not execute the query; just compile it and save the execution plan in the file specified with the -o option.\n\n"
         "--execute-plan\nDo not compile the query; instead load the execution plan from the file specified by the -f -q options, and execute the loaded plan.\n\n"
+        "--disable-http-resolution\nDo not use HTTP to resolve URIs\n\n"
         ;
   }
 

=== modified file 'doc/zorba/options.dox'
--- doc/zorba/options.dox	2012-10-08 12:09:36 +0000
+++ doc/zorba/options.dox	2012-11-08 22:00:29 +0000
@@ -67,8 +67,9 @@
 <li><b>scripting:</b> This local name can be used to enable or disable the 
 Zorba Scripting Extension. Per default, the feature is enabled.
 </li>
-<li><b>xqddf:</b> The <tt>xqddf</tt> local name refers to the Zorba specific
-XQuery Data Definition Facility. The feature is enabled by default.
+<li><b>ddl:</b> The <tt>ddl</tt> local name refers to the static
+(language-level) Data Description Language portion of the \ref xqddf.
+The feature is enabled by default.
 </li>
 <li><b>trace:</b> The 
 <a href="http://www.w3.org/TR/xpath-functions-30/#func-trace">fn:trace</a> 
@@ -86,6 +87,18 @@
 <a href="http://www.w3.org/TR/xpath-functions-30/#func-doc">fn:doc</a>. DTD 
 validation is disabled by default.
 </li>
+<li><b>http-uri-resolution:</b> When resolving URIs for schema and module
+import statements, Zorba always first attempts to map the URI to a local
+filesystem location (see \ref builtin_uri_resolver). As a fallback, Zorba
+will then by default attempt to use HTTP, HTTPS, or FTP (depending on the
+URI scheme) to download the resource from the internet. The local name
+<tt>http-uri-resolution</tt> can be used to enable or disable this network
+fallback. By default it is enabled.
+\note Because XQuery options must appear in queries after import statements,
+unfortunately the <tt>http-uri-resolution</tt> option can have no effect if
+it is specified inside query text. It must be specified using the C++ API
+or a Zorba command-line option. An error will be raised if this option is
+specified inside query text to avoid confusion.
 </ul>
 
 

=== modified file 'doc/zorba/uriresolvers.dox'
--- doc/zorba/uriresolvers.dox	2012-09-19 21:16:15 +0000
+++ doc/zorba/uriresolvers.dox	2012-11-08 22:00:29 +0000
@@ -20,7 +20,7 @@
 which will allow you to resolve URIs from queries in almost any way
 imaginable to handle application-specific problems.
 
-\section builtin Zorba's Built-in URI Resolver
+\section builtin_uri_resolver Zorba's Built-in URI Resolver
 
 XQuery itself offers an approach to locating resources via the "at"
 clause in <code>import module</code> and <code>import schema</code>
@@ -143,8 +143,9 @@
 
 If, after searching all URI path directories, no match is found for
 a given URI, Zorba will by default fall back to interpretting the URI
-as a URL and loading the resource via HTTP (assuming the URI
-has the http: scheme).
+as a URL and loading the resource via HTTP / HTTPS / FTP (depending on
+the URI scheme). This behaviour can be defeated by disabling the
+<tt>http-uri-resolution</tt> Zorba option (see \ref options_features).
 
 \section libpath Zorba's Library Path
 

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-10-08 12:09:36 +0000
+++ include/zorba/pregenerated/diagnostic_list.h	2012-11-08 22:00:29 +0000
@@ -450,6 +450,8 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0060_OPTION_NOT_KNOWN;
 
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP0061_DISABLE_HTTP_OPTION_IN_QUERY;
+
 #if !defined(ZORBA_NO_FULL_TEXT)
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZXQP8401_THESAURUS_VERSION_MISMATCH;
 

=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2012-10-08 12:09:36 +0000
+++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2012-11-08 22:00:29 +0000
@@ -180,6 +180,10 @@
 declare variable $zerr:ZXQP0060 as xs:QName := fn:QName($zerr:NS, "zerr:ZXQP0060");
 
 (:~
+:)
+declare variable $zerr:ZXQP0061 as xs:QName := fn:QName($zerr:NS, "zerr:ZXQP0061");
+
+(:~
  :
  : The version of the thesaurus is not the expected version.
  : 

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-10-29 12:31:50 +0000
+++ src/compiler/translator/translator.cpp	2012-11-08 22:00:29 +0000
@@ -3334,6 +3334,12 @@
       if (qnameItem->getPrefix().empty() && qnameItem->getNamespace().empty())
         RAISE_ERROR(err::XPST0081, loc, ERROR_PARAMS(qnameItem->getStringValue()));
 
+      if (qnameItem->getNamespace() == static_context::ZORBA_OPTION_FEATURE_NS &&
+          value == "http-uri-resolution")
+      {
+        RAISE_ERROR(zerr::ZXQP0061_DISABLE_HTTP_OPTION_IN_QUERY, loc,
+                    ERROR_PARAMS(value));
+      }
       theSctx->bind_option(qnameItem, value, opt_decl->get_location());
 
       if (qnameItem->getNamespace() == static_context::ZORBA_OPTION_OPTIM_NS &&

=== modified file 'src/context/default_uri_mappers.cpp'
--- src/context/default_uri_mappers.cpp	2012-09-19 21:16:15 +0000
+++ src/context/default_uri_mappers.cpp	2012-11-08 22:00:29 +0000
@@ -17,6 +17,7 @@
 #include "stdafx.h"
 
 #include <context/default_uri_mappers.h>
+#include <context/default_url_resolvers.h>
 #include <util/uri_util.h>
 #include <util/fs_util.h>
 #include <zorbatypes/URI.h>
@@ -192,7 +193,14 @@
 
   // Finally, append the original URI, so that it will be resolved
   // as-is if there's nothing appropriate on the local filesystem.
-  oUris.push_back(aUri);
+  // Note: For module or schema imports, don't do this if it's a
+  // network (HTTP) URI and the "http_resolution" feature is disabled
+  // on this context.
+  if ( (lKind != EntityData::MODULE && lKind != EntityData::SCHEMA) ||
+       aSctx.is_feature_set(feature::http_resolution) ||
+       (HTTPURLResolver::isHTTPScheme(aUri) == false) ) {
+    oUris.push_back(aUri);
+  }
 }
 
 ZorbaCollectionURIMapper::~ZorbaCollectionURIMapper()

=== modified file 'src/context/default_uri_mappers.h'
--- src/context/default_uri_mappers.h	2012-09-19 21:16:15 +0000
+++ src/context/default_uri_mappers.h	2012-11-08 22:00:29 +0000
@@ -91,10 +91,10 @@
   virtual void mapURI(zstring const& aUri,
     EntityData const* aEntityData,
     static_context const& aSctx,
-    std::vector<zstring>& oUrls);
+    std::vector<zstring>& oUris);
 };
 
-} /* namespace zorba::impl */
+} /* namespace zorba::internal */
 
 } /* namespace zorba */
 

=== modified file 'src/context/default_url_resolvers.cpp'
--- src/context/default_url_resolvers.cpp	2012-09-19 21:16:15 +0000
+++ src/context/default_url_resolvers.cpp	2012-11-08 22:00:29 +0000
@@ -34,34 +34,44 @@
 
 namespace internal {
 
-/******
- * http: (and https: and ftp:) URL resolver.
- ******/
-
-Resource*
-HTTPURLResolver::resolveURL
-(zstring const& aUrl, EntityData const* aEntityData)
+/**
+ * Utility function that identifies URL schemes that will be handled
+ * by the HttpStream class.
+ */
+bool
+HTTPURLResolver::isHTTPScheme(zstring const& aUrl)
 {
-  switch ( aEntityData->getKind() ) {
-    case EntityData::COLLECTION:
-#ifndef ZORBA_NO_FULL_TEXT
-    case EntityData::THESAURUS:
-#endif /* ZORBA_NO_FULL_TEXT */
-      return nullptr;
-    default:
-      break;
-  }
-
   uri::scheme lScheme = uri::get_scheme(aUrl);
   switch (lScheme) {
     case uri::http:
     case uri::https:
     case uri::ftp:
-      // Fall through to actual implementation
+      return true;
+    default:
+      return false;
+  }
+}
+
+/******
+ * http: (and https: and ftp:) URL resolver.
+ ******/
+
+Resource*
+HTTPURLResolver::resolveURL
+(zstring const& aUrl, EntityData const* aEntityData)
+{
+  switch ( aEntityData->getKind() ) {
+    case EntityData::COLLECTION:
+#ifndef ZORBA_NO_FULL_TEXT
+    case EntityData::THESAURUS:
+#endif /* ZORBA_NO_FULL_TEXT */
+      return nullptr;
+    default:
       break;
-    default:
-      // We don't implement other schemes
-      return NULL;
+  }
+
+  if (!isHTTPScheme(aUrl)) {
+    return nullptr;
   }
   try {
     std::auto_ptr<HttpStream> lStream(new HttpStream(aUrl));
@@ -76,7 +86,6 @@
   }
 }
 
-
 /******
  * file: URL resolver.
  ******/

=== modified file 'src/context/default_url_resolvers.h'
--- src/context/default_url_resolvers.h	2012-09-19 21:16:15 +0000
+++ src/context/default_url_resolvers.h	2012-11-08 22:00:29 +0000
@@ -42,6 +42,8 @@
 {
 public:
 
+  static bool isHTTPScheme(zstring const& aUrl);
+
   virtual Resource* resolveURL(zstring const& aUrl,
     EntityData const* aEntityData);
 };

=== modified file 'src/context/features.cpp'
--- src/context/features.cpp	2012-09-19 21:16:15 +0000
+++ src/context/features.cpp	2012-11-08 22:00:29 +0000
@@ -49,6 +49,11 @@
         res = dtd;
         return true;
       }
+      else if ( ztd::equals(s, "http-uri-resolution") )
+      {
+        res = http_resolution;
+        return true;
+      }
       return false;
     }
   }

=== modified file 'src/context/features.h'
--- src/context/features.h	2012-09-19 21:16:15 +0000
+++ src/context/features.h	2012-11-08 22:00:29 +0000
@@ -30,7 +30,8 @@
       scripting   = 4,
       hof         = 8,
       trace       = 16,
-      dtd         = 32
+      dtd         = 32,
+      http_resolution = 64,
     };
 
     bool kind_for( char const*, kind& );

=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp	2012-10-08 12:09:36 +0000
+++ src/context/root_static_context.cpp	2012-11-08 22:00:29 +0000
@@ -185,6 +185,7 @@
   set_feature( feature::ddl );
   set_feature( feature::scripting );
   set_feature( feature::trace );
+  set_feature( feature::http_resolution );
 } 
 
 

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2012-10-23 19:07:56 +0000
+++ src/diagnostics/diagnostic_en.xml	2012-11-08 22:00:29 +0000
@@ -1808,7 +1808,11 @@
     </diagnostic>
 
     <diagnostic code="ZXQP0060" name="OPTION_NOT_KNOWN">
-      <value>"$1": unkown option</value>
+      <value>"$1": unknown option</value>
+    </diagnostic>
+
+    <diagnostic code="ZXQP0061" name="DISABLE_HTTP_OPTION_IN_QUERY">
+      <value>"$1": this option cannot be specified in a query, it must be set via C++ API or command-line parameter</value>
     </diagnostic>
 
     <diagnostic code="ZXQP8401" name="THESAURUS_VERSION_MISMATCH"

=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp	2012-10-08 12:09:36 +0000
+++ src/diagnostics/pregenerated/diagnostic_list.cpp	2012-11-08 22:00:29 +0000
@@ -655,6 +655,9 @@
 ZorbaErrorCode ZXQP0060_OPTION_NOT_KNOWN( "ZXQP0060" );
 
 
+ZorbaErrorCode ZXQP0061_DISABLE_HTTP_OPTION_IN_QUERY( "ZXQP0061" );
+
+
 #if !defined(ZORBA_NO_FULL_TEXT)
 ZorbaErrorCode ZXQP8401_THESAURUS_VERSION_MISMATCH( "ZXQP8401" );
 

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2012-10-23 19:07:56 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2012-11-08 22:00:29 +0000
@@ -497,7 +497,8 @@
   { "ZXQP0039", "\"$1\": invalid version specification" },
   { "ZXQP0040", "\"$1\": function invokes a nondeterministic function but is missing the nondeterministic annotation" },
   { "ZXQP0050", "\"$1\": feature not available" },
-  { "ZXQP0060", "\"$1\": unkown option" },
+  { "ZXQP0060", "\"$1\": unknown option" },
+  { "ZXQP0061", "\"$1\": this option cannot be specified in a query, it must be set via C++ API or command-line parameter" },
 #if !defined(ZORBA_NO_FULL_TEXT)
   { "ZXQP8401", "\"$1\": wrong WordNet file version; should be \"$2\"" },
 #endif

=== added file 'test/rbkt/ExpQueryResults/zorba/uris/disable-http-3.xml.res'
--- test/rbkt/ExpQueryResults/zorba/uris/disable-http-3.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/uris/disable-http-3.xml.res	2012-11-08 22:00:29 +0000
@@ -0,0 +1,1 @@
+<query>querystring</query>

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2012-10-20 21:29:37 +0000
+++ test/rbkt/Queries/CMakeLists.txt	2012-11-08 22:00:29 +0000
@@ -491,6 +491,13 @@
 # hitting w3.org for the DTD, which is bad.
 SET_TESTS_PROPERTIES(test/rbkt/zorba/schemas/local-xhtml
   PROPERTIES TIMEOUT 5)
+# Bug 867363. These should fail or pass quickly because HTTP download
+# is disabled.
+SET_TESTS_PROPERTIES(test/rbkt/zorba/uris/disable-http
+  PROPERTIES TIMEOUT 5)
+SET_TESTS_PROPERTIES(test/rbkt/zorba/uris/disable-http-2
+  PROPERTIES TIMEOUT 5)
+
 
 # --------------------------------------------------------------------------
 # the list of tests that are failing but can be accepted by the commit queue

=== added file 'test/rbkt/Queries/zorba/uris/disable-http-2.spec'
--- test/rbkt/Queries/zorba/uris/disable-http-2.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http-2.spec	2012-11-08 22:00:29 +0000
@@ -0,0 +1,2 @@
+Options: {http://www.zorba-xquery.com/options/features}disable=http-uri-resolution
+Error: http://www.w3.org/2005/xqt-errors:XQST0059

=== added file 'test/rbkt/Queries/zorba/uris/disable-http-2.xq'
--- test/rbkt/Queries/zorba/uris/disable-http-2.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http-2.xq	2012-11-08 22:00:29 +0000
@@ -0,0 +1,4 @@
+import module namespace slow = "http://www.zorba-xquery.com/test/uris/slow"
+  at "slow.xqlib";
+
+slow:ok()

=== added file 'test/rbkt/Queries/zorba/uris/disable-http-3.spec'
--- test/rbkt/Queries/zorba/uris/disable-http-3.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http-3.spec	2012-11-08 22:00:29 +0000
@@ -0,0 +1,1 @@
+Options: {http://www.zorba-xquery.com/options/features}disable=http-uri-resolution

=== added file 'test/rbkt/Queries/zorba/uris/disable-http-3.xq'
--- test/rbkt/Queries/zorba/uris/disable-http-3.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http-3.xq	2012-11-08 22:00:29 +0000
@@ -0,0 +1,2 @@
+(: Ensure that disabling HTTP URI resolution doesn't defeat fn:doc(). :)
+fn:doc("http://zorbatest.lambda.nu:8080/cgi-bin/test-xml?querystring")/body/query

=== added file 'test/rbkt/Queries/zorba/uris/disable-http-5.spec'
--- test/rbkt/Queries/zorba/uris/disable-http-5.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http-5.spec	2012-11-08 22:00:29 +0000
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/errors:ZXQP0061

=== added file 'test/rbkt/Queries/zorba/uris/disable-http-5.xq'
--- test/rbkt/Queries/zorba/uris/disable-http-5.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http-5.xq	2012-11-08 22:00:29 +0000
@@ -0,0 +1,8 @@
+(: Cannot specify this option inside query, unfortunately, since options :)
+(: must come after imports. :)
+declare namespace op = "http://www.zorba-xquery.com/options/features";
+declare option op:disable "http-uri-resolution";
+
+1
+
+

=== added file 'test/rbkt/Queries/zorba/uris/disable-http.spec'
--- test/rbkt/Queries/zorba/uris/disable-http.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http.spec	2012-11-08 22:00:29 +0000
@@ -0,0 +1,2 @@
+Options: {http://www.zorba-xquery.com/options/features}disable=http-uri-resolution
+Error: http://www.w3.org/2005/xqt-errors:XQST0059

=== added file 'test/rbkt/Queries/zorba/uris/disable-http.xq'
--- test/rbkt/Queries/zorba/uris/disable-http.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http.xq	2012-11-08 22:00:29 +0000
@@ -0,0 +1,5 @@
+(: For various reasons, importing a bad schema via HTTP can take :)
+(: minutes to complete. This test should time out unless the :)
+(: http-uri-resolution feature is disabled. :)
+import schema "http://www.w3.org/";
+1

=== added file 'test/rbkt/Queries/zorba/uris/slow.xqlib'
--- test/rbkt/Queries/zorba/uris/slow.xqlib	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/slow.xqlib	2012-11-08 22:00:29 +0000
@@ -0,0 +1,11 @@
+(: For various reasons, importing a bad schema via HTTP can take :)
+(: minutes to complete. A test importing this module should time out :)
+(: unless the http-uri-resolution feature is disabled. :)
+module namespace slow = "http://www.zorba-xquery.com/test/uris/slow";
+
+import schema "http://www.w3.org/";
+
+declare function slow:ok() as xs:string
+{
+  "OK"
+};