Merge remote-tracking branch 'origin/master' into rewrite-filter

diff --combined src/Makefile.am
index 92f526e,564f7b8..42a9577
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -21,7 -21,6 +21,7 @@@ filter_src = 
        filter_http_client.cpp filter_http_client.hpp \
        filter_http_file.cpp filter_http_file.hpp \
        filter_http_rewrite1.cpp filter_http_rewrite1.hpp \
 +      filter_http_rewrite.cpp filter_http_rewrite.hpp \
        filter_limit.cpp filter_limit.hpp \
        filter_load_balance.cpp filter_load_balance.hpp \
        filter_log.cpp filter_log.hpp \
@@@ -43,6 -42,7 +43,7 @@@ lib_LTLIBRARIES = libmetaproxy.l
  libmetaproxy_la_LDFLAGS = -version-info 4:0:0 -export-dynamic
  
  libmetaproxy_la_SOURCES = \
+       $(filter_src) \
        factory_filter.cpp factory_filter.hpp \
        factory_static.cpp factory_static.hpp \
        filter.cpp \
@@@ -57,7 -57,6 +58,7 @@@
        torus.cpp torus.hpp \
        url_recipe.cpp \
        util.cpp \
 +      html_parser.hpp html_parser.cpp \
        router_chain.cpp \
          router_flexml.hpp router_flexml.cpp \
        router_xml.cpp \
@@@ -80,7 -79,7 +81,7 @@@ bin_PROGRAMS = metaprox
  noinst_PROGRAMS = tstdl
  
  tstdl_SOURCES = tstdl.cpp
- metaproxy_SOURCES = metaproxy_prog.cpp $(filter_src)
+ metaproxy_SOURCES = metaproxy_prog.cpp
  
  # Rules for dl programs
  pkglib_LTLIBRARIES = metaproxy_filter_dl.la
@@@ -110,42 -109,36 +111,41 @@@ check_PROGRAMS = 
        test_filter_record_transform \
        test_filter_sru_to_z3950 \
        test_filter_virt_db \
 +      test_filter_rewrite \
        test_ses_map \
        test_router_flexml \
 +      test_html_parser \
        test_xmlutil
  
  TESTS=$(check_PROGRAMS)
  
  test_package1_SOURCES=test_package1.cpp
  test_pipe_SOURCES=test_pipe.cpp
- test_filter1_SOURCES=test_filter1.cpp $(filter_src)
- test_filter2_SOURCES=test_filter2.cpp $(filter_src)
+ test_filter1_SOURCES=test_filter1.cpp
+ test_filter2_SOURCES=test_filter2.cpp
  test_session1_SOURCES=test_session1.cpp
  test_session2_SOURCES=test_session2.cpp
  test_boost_threads_SOURCES=test_boost_threads.cpp
  test_thread_pool_observer_SOURCES = test_thread_pool_observer.cpp
- test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp $(filter_src)
- test_filter_factory_SOURCES = test_filter_factory.cpp $(filter_src)
- test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp $(filter_src)
- test_filter_log_SOURCES = test_filter_log.cpp $(filter_src)
- test_filter_multi_SOURCES = test_filter_multi.cpp $(filter_src)
- test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp $(filter_src)
- test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp $(filter_src)
- test_filter_backend_test_SOURCES = test_filter_backend_test.cpp $(filter_src)
- test_filter_bounce_SOURCES = test_filter_bounce.cpp $(filter_src)
- test_filter_record_transform_SOURCES = test_filter_record_transform.cpp \
-       $(filter_src)
- test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp $(filter_src)
- test_filter_virt_db_SOURCES = test_filter_virt_db.cpp $(filter_src)
+ test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp 
+ test_filter_factory_SOURCES = test_filter_factory.cpp 
+ test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp 
+ test_filter_log_SOURCES = test_filter_log.cpp 
+ test_filter_multi_SOURCES = test_filter_multi.cpp 
+ test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp
+ test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp
+ test_filter_backend_test_SOURCES = test_filter_backend_test.cpp
+ test_filter_bounce_SOURCES = test_filter_bounce.cpp
+ test_filter_record_transform_SOURCES = test_filter_record_transform.cpp 
+ test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp
+ test_filter_virt_db_SOURCES = test_filter_virt_db.cpp 
  test_ses_map_SOURCES = test_ses_map.cpp
- test_router_flexml_SOURCES = test_router_flexml.cpp $(filter_src)
+ test_router_flexml_SOURCES = test_router_flexml.cpp
  test_xmlutil_SOURCES = test_xmlutil.cpp
  
 +test_html_parser_SOURCES = test_html_parser.cpp $(filter_src)
 +test_filter_rewrite_SOURCES = test_filter_rewrite.cpp $(filter_src)
 +
  # doxygen target
  dox:
        (cd $(top_srcdir) ; make dox) 

diff --combined src/factory_static.cpp
index 26078b3,3d88a82..95d0a62
--- 1/src/factory_static.cpp
--- 2/src/factory_static.cpp
+++ b/src/factory_static.cpp
@@@ -54,14 -54,11 +54,12 @@@ Foundation, Inc., 51 Franklin St, Fift
  #include "filter_z3950_client.hpp"
  #include "filter_zeerex_explain.hpp"
  #include "filter_zoom.hpp"
 +#include "filter_http_rewrite.hpp"
  
  namespace mp = metaproxy_1;
  
  mp::FactoryStatic::FactoryStatic()
  {
- #ifdef HAVE_DLFCN_H
- #else
      struct metaproxy_1_filter_struct *buildins[] = {
          &metaproxy_1_filter_auth_simple,
          &metaproxy_1_filter_backend_test,
@@@ -69,7 -66,7 +67,7 @@@
  #ifndef WIN32
          &metaproxy_1_filter_cgi,
  #endif
-         &metaproxy_1_filter_cql_to_rpn,
+         &metaproxy_1_filter_cql_rpn,
          &metaproxy_1_filter_frontend_net,
          &metaproxy_1_filter_http_client,
          &metaproxy_1_filter_http_file,
@@@ -84,21 -81,18 +82,19 @@@
          &metaproxy_1_filter_sd_remove,
          &metaproxy_1_filter_session_shared,
          &metaproxy_1_filter_sort,
-         &metaproxy_1_filter_sru_to_z3950,
+         &metaproxy_1_filter_sru_z3950,
          &metaproxy_1_filter_template,
          &metaproxy_1_filter_virt_db,
          &metaproxy_1_filter_z3950_client,
          &metaproxy_1_filter_zeerex_explain,
          &metaproxy_1_filter_zoom,
 +        &metaproxy_1_filter_http_rewrite,
          0
      };
      int i;
  
      for (i = 0; buildins[i]; i++)
          add_creator(buildins[i]->type, buildins[i]->creator);
- // WIN32
- #endif
  }