- mv {,apache1-}*

Changed files:
    mod_xslt-includes.patch -> 1.2
    mod_xslt-make.patch -> 1.2
    mod_xslt-module.patch -> 1.2
    mod_xslt-regex.patch -> 1.2
    mod_xslt.conf -> 1.4

diff --git a/mod_xslt-includes.patch b/mod_xslt-includes.patch
deleted file mode 100644 (file)
index 0f3e9e9..0000000
--- a/mod_xslt-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- modxslt/mod_xslt.c.orig    Thu Aug 24 04:05:28 2000
-+++ modxslt/mod_xslt.c Tue Sep 25 15:22:04 2001
-@@ -43,7 +43,7 @@
- #include "http_protocol.h"
- #include "ap_config.h"
- #include "util_uri.h"
--#include "alloc.h"
-+//#include "alloc.h"
- #include "http_core.h"
- #include "sablot.h"
- #include "http_log.h"

diff --git a/mod_xslt-make.patch b/mod_xslt-make.patch
deleted file mode 100644 (file)
index fbb55e1..0000000
--- a/mod_xslt-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- modxslt/Makefile.orig      Fri Sep 13 17:09:40 2002
-+++ modxslt/Makefile   Fri Sep 13 17:09:21 2002
-@@ -6,7 +6,7 @@
- 
- #   compile the shared object file
- mod_xslt.so: mod_xslt.c
--      $(APXS) -c mod_xslt.c -o mod_xslt.so
-+      $(APXS) -c mod_xslt.c -o mod_xslt.so -lsablot
- 
- #   cleanup
- clean:

diff --git a/mod_xslt-module.patch b/mod_xslt-module.patch
deleted file mode 100644 (file)
index ee65d1b..0000000
--- a/mod_xslt-module.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- modxslt/mod_xslt.c.orig    Fri Sep 13 17:24:24 2002
-+++ modxslt/mod_xslt.c Fri Sep 13 17:24:05 2002
-@@ -57,7 +57,7 @@
-     int debug;
- } mod_xslt_cfg;
- 
--module MODULE_VAR_EXPORT mod_xslt_module;
-+module MODULE_VAR_EXPORT xslt_module;
- 
- const char *mod_xslt_dyndoc_cmd(cmd_parms *cmd, void *m, int flag);
- const char *mod_xslt_dynss_cmd(cmd_parms *cmd, void *m, int flag);
-@@ -205,7 +205,7 @@
- 
-     void *theproc;
-     mod_xslt_cfg *cfg = (mod_xslt_cfg*) 
--      ap_get_module_config(r->per_dir_config, &mod_xslt_module);
-+      ap_get_module_config(r->per_dir_config, &xslt_module);
-     se = SablotCreateProcessor (&theproc);
-     if (cfg->debug)
-       se |= SablotRegHandler(theproc, HLR_MESSAGE, &sablotMH, (void*)r);
-@@ -246,7 +246,7 @@
-   int cnt1;
-   request_rec * subr = NULL;
-   mod_xslt_cfg *cfg = (mod_xslt_cfg*) 
--      ap_get_module_config(r->per_dir_config, &mod_xslt_module);
-+      ap_get_module_config(r->per_dir_config, &xslt_module);
- 
- 
-   /* Setup some common strings of text, for file not found, etc. */
-@@ -455,7 +455,7 @@
- };
- 
- /* Dispatch list for API hooks */
--module MODULE_VAR_EXPORT mod_xslt_module = {
-+module MODULE_VAR_EXPORT xslt_module = {
-     STANDARD_MODULE_STUFF, 
-     mod_xslt_init,                  /* module initializer                  */
-     mod_xslt_create_dir_cfg,    /* create per-dir    config structures */

diff --git a/mod_xslt-regex.patch b/mod_xslt-regex.patch
deleted file mode 100644 (file)
index 61cc7ea..0000000
--- a/mod_xslt-regex.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Binary files modxslt/mod_xslt-1.1.tar and modxslt2/mod_xslt-1.1.tar differ
-diff -urN modxslt/mod_xslt.c modxslt2/mod_xslt.c
---- modxslt/mod_xslt.c Wed Apr 24 22:27:15 2002
-+++ modxslt2/mod_xslt.c        Wed Apr 24 22:27:47 2002
-@@ -251,7 +251,7 @@
-   /* Setup some common strings of text, for file not found, etc. */
-  
-   regmatch_t pmatch[2];
--  regex_t *cpat = ap_pregcomp(r->pool, "\\<!DOCTYPE", REG_EXTENDED);
-+  regex_t *cpat = ap_pregcomp(r->pool, "<!DOCTYPE", REG_EXTENDED);
- 
-   int rc = OK;
-   int se = 1;

diff --git a/mod_xslt.conf b/mod_xslt.conf
deleted file mode 100644 (file)
index b5cd492..0000000
--- a/mod_xslt.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-# Sample configuration for apache-mod_xslt
-
-########
-########  XSLTDebug
-########
-#
-#   Syntax: XSLTDebug On|Off
-#   Default: XSLTDebug On
-#   Context: everythere
-#
-#   When switched on (default) redirects all xml and xslt processing
-#   messages to browser. If switched off all these messages will go to
-#   error_log and internal error (HTTP/1.0 500 Internal Error) will be
-#   returned to browser.
-#
-
-#XSLTDebug Off
-
-########
-########  XSLTtmpPath
-########
-#
-#   Syntax: XSLTtmpPath directory
-#   Default: none
-#   Context: server config
-#
-#   This directive configures the path where temporary documents will be
-#   stored. This directive is mandatory if you are going to use Dynamic
-#   Document or/and Stylesheet generation feature. The directory you point
-#   should be created before server starts and should have 0700 permitions
-#   and should be owned by the user with whose permitions the server is
-#   run. This is necessary because Apache 1.x does not have an API for
-#   writing filters for dynamic contents. Hopefully Apache 2.0 will change
-#   this situation.
-#
-
-#XSLTtmpPath /tmp
-
-########
-########  XSLTDynamicDoc
-########
-#
-#   Syntax: XSLTDynamicDoc On|Off
-#   Default: XSLTDynamicDoc Off
-#   Context: everythere
-#
-#   When switched on, this directive equires apache to make subrequest for
-#   document data. This way document could be generated by SSI, CGI-script
-#   or other dynamic methods.
-#
-#   Dynamic XML documents could not be generated by mod_xslt module
-#   because that would force this module into endless recursion. If you
-#   will try to configure this way debugging message will be given on
-#   request to such document.
-#
-
-#XSLTDynamicDoc On
-
-########
-########  XSLTDynamicSS
-########
-#
-#   Syntax: XSLTDynamicSS On|Off
-#   Default: XSLTDynamicSS Off
-#   Context: everythere
-#
-#   When switched on, requires apache to make subrequest for Stylesheets.
-#   This way stylesheets could be generated by SSI, CGI-script or other
-#   dynamic methods.
-#
-#   Dynamic XML documents could be generated by mod_xslt module. But this
-#   possibility may lead to endless recursion therefore only 5 levels of
-#   recursion are allowed.
-#
-
-#XSLTDynamicSS On
-
-########
-########  Sample location
-########
-#
-#   Do NOT add instruction AddHandler mod_xslt .xml! This will lead to
-#   endless recursion. Mod_xslt is capable to detect it therefore no crash
-#   of server will happen, but browser will get Error message. And this is
-#   not that you want [most of the times].
-#
-
-#<Location /xslt>
-#      AddHandler mod_xslt .html
-#      AddHandler mod_xslt .txt
-#</Location>
-