lp:~zorba-coders/zorba/fix-website-failures

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 10644

Matthias Brantner: Approve on 2012-02-05

Chris Hillery: Approve on 2012-02-05

Diff: 354 lines (+46/-31)

24 files modified

CMakeLists.txt (+3/-2)
include/zorba/config.h.cmake (+3/-0)
modules/com/zorba-xquery/www/modules/CMakeLists.txt (+3/-0)
src/context/static_context.cpp (+4/-3)
src/util/http_util.cpp (+7/-2)
src/util/http_util.h (+0/-2)
test/http-test-data/docroot/http-test-data/http2.xml (+4/-0)
test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq (+1/-1)
test/rbkt/Queries/zorba/store/example_3.xq (+4/-4)
test/rbkt/Queries/zorba/versioning/import-chain1.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import-chain2.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import1.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import2.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import3.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import4.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import5.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import6.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import7.xq (+1/-1)
test/rbkt/modules/CMakeLists.txt (+3/-3)
test/rbkt/modules/bad-ver.xq (+1/-1)
test/rbkt/modules/module-A.xq (+1/-1)
test/rbkt/modules/module-B.xq (+1/-1)
test/rbkt/modules/ver.xq (+1/-1)
test/rbkt/modules/ver2.xq (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

10644. By Chris Hillery on 2012-02-05

Several fixes related to test breakages caused by zorba-xquery.com changes:
1. Don't attempt HTTP resolution w/ HttpStream if Zorba compiled without CURL.
2. store/example_3 test: load content from zorbatest site like other tests.
3. fetch_bogus2 and impot5 test: change "ver" test module to be identified
   with a flworfound.org URI, so we'll get a 404 when loading it wrong.
   (Both example.com and zorba-xquery.com don't return 404 for unknown URLs.)

10643. By William Candillon on 2012-02-02

Fix for bug #918592 Approved: Chris Hillery, Rodolfo Ochoa

10642. By Ghislain Fourny on 2012-02-02

Correcting two typos (parameter name and document debug output). Approved: Ghislain Fourny, Matthias Brantner

10641. By Markos Zaharioudakis on 2012-02-02

w3c test modules-schema-context now passes Approved: Markos Zaharioudakis

10640. By Daniel Turcanu on 2012-02-02

several fixes for the plan serializer + implemented materialize_clause::clone() Approved: Matthias Brantner, Chris Hillery

10639. By Chris Hillery on 2012-02-02

Added DECLARE_ZORBA_URI_FILE() for installing files of any type that we would like to load by URI. Also made built-in URI mappers look on the filesystem for any kind of URIs, not just modules and schemas. Approved: Cezar Andrei, Chris Hillery

10638. By Chris Hillery on 2012-02-01

Install the XHTML DTD locally so we don't ask w3.org for it. Approved: Chris Hillery, Sorin Marian Nasoi

10637. By Paul J. Lucas on 2012-01-31

Fixed bug 924063 (sentence is incorrectly incremented when token characters end without sentence terminator) Approved: Matthias Brantner, Paul J. Lucas

10636. By Markos Zaharioudakis on 2012-01-30

type-related optimizations for sequence-type iterators Approved: Markos Zaharioudakis

10635. By Chris Hillery on 2012-01-30

Fix filename when creating library for unversioned module. Approved: Dennis Knochenwefel, Chris Hillery