summaryrefslogtreecommitdiffstats
path: root/httpd-2.0.45-export.patch
diff options
context:
space:
mode:
authorjorton <jorton@fedoraproject.org>2005-12-02 10:43:00 +0000
committerjorton <jorton@fedoraproject.org>2005-12-02 10:43:00 +0000
commit96e0b3384f3e4b6be9bc3128de327f3f7fab3265 (patch)
tree1074861f1d2c51c835ffcbed0fe466d354b67889 /httpd-2.0.45-export.patch
parent614542ad53a3f1a7f89cc35c4dd8749fb547ee60 (diff)
downloadhttpd-96e0b3384f3e4b6be9bc3128de327f3f7fab3265.tar.gz
httpd-96e0b3384f3e4b6be9bc3128de327f3f7fab3265.tar.xz
httpd-96e0b3384f3e4b6be9bc3128de327f3f7fab3265.zip
- update to 2.2.0httpd-2_2_0-1
Diffstat (limited to 'httpd-2.0.45-export.patch')
-rw-r--r--httpd-2.0.45-export.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/httpd-2.0.45-export.patch b/httpd-2.0.45-export.patch
index 06aedc0..2f3dad8 100644
--- a/httpd-2.0.45-export.patch
+++ b/httpd-2.0.45-export.patch
@@ -6,37 +6,6 @@ Upstream-HEAD: needed
Upstream-2.0: omit
Upstream-Status: EXPORT_DIRS change is conditional on using shared apr
---- httpd-2.0.53/server/main.c.export
-+++ httpd-2.0.53/server/main.c
-@@ -627,28 +627,6 @@
- return 0; /* Termination 'ok' */
- }
-
--/* force Expat to be linked into the server executable */
--#if defined(USE_EXPAT) && !defined(SHARED_CORE_BOOTSTRAP)
--#include "xmlparse.h"
--const XML_LChar *suck_in_expat(void);
--const XML_LChar *suck_in_expat(void)
--{
-- return XML_ErrorString(XML_ERROR_NONE);
--}
--#endif /* USE_EXPAT */
--
--#ifndef SHARED_CORE_BOOTSTRAP
--/*
-- * Force apr_password_validate() into the image so that modules like
-- * mod_auth can use it even if they're dynamically loaded.
-- */
--void suck_in_apr_password_validate(void);
--void suck_in_apr_password_validate(void)
--{
-- apr_password_validate("a", "b");
--}
--#endif
--
- #ifdef AP_USING_AUTOCONF
- /* This ugly little hack pulls any function referenced in exports.c into
- * the web server. exports.c is generated during the build, and it
--- httpd-2.0.53/server/Makefile.in.export
+++ httpd-2.0.53/server/Makefile.in
@@ -59,10 +59,6 @@