- fixes for previous commithttpd-2_2_6-3

2 files changed, 30 insertions, 20 deletions

diff --git a/httpd-2.2.6-ssllibver.patch b/httpd-2.2.6-ssllibver.patch
index c46835d..5281793 100644
--- a/httpd-2.2.6-ssllibver.patch
+++ b/httpd-2.2.6-ssllibver.patch
@@ -1,14 +1,3 @@
---- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
-+++ httpd-2.2.6/modules/ssl/ssl_private.h
-@@ -648,7 +648,7 @@ void         ssl_die(void);
- void         ssl_log_ssl_error(const char *, int, int, server_rec *);
- 
- /**  Variables  */
--void         ssl_var_register(void);
-+void         ssl_var_register(apr_pool_t *p);
- char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
- const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
- 
 --- httpd-2.2.6/modules/ssl/mod_ssl.c.ssllibver
 +++ httpd-2.2.6/modules/ssl/mod_ssl.c
 @@ -500,7 +500,7 @@ static void ssl_register_hooks(apr_pool_
@@ -22,7 +11,7 @@
      APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
 --- httpd-2.2.6/modules/ssl/ssl_engine_vars.c.ssllibver
 +++ httpd-2.2.6/modules/ssl/ssl_engine_vars.c
-@@ -58,12 +58,30 @@ static int ssl_is_https(conn_rec *c)
+@@ -58,12 +58,32 @@ static int ssl_is_https(conn_rec *c)
      return sslconn && sslconn->ssl;
  }
  
@@ -33,6 +22,8 @@
 +
 +void ssl_var_register(apr_pool_t *p)
  {
++    char *cp, *cp2;
++
      APR_REGISTER_OPTIONAL_FN(ssl_is_https);
      APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
      APR_REGISTER_OPTIONAL_FN(ssl_ext_lookup);
@@ -55,7 +46,7 @@
  }
  
  /* This function must remain safe to use for a non-SSL connection. */
-@@ -635,34 +653,14 @@ static void ssl_var_lookup_ssl_cipher_bi
+@@ -635,39 +655,17 @@ static void ssl_var_lookup_ssl_cipher_bi
  
  static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
  {
@@ -81,15 +72,33 @@
 -
      if (strEQ(var, "INTERFACE")) {
 -        result = apr_pstrdup(p, interface);
-+        result = apr_pstrdup(p, var_interface);
++        return apr_pstrdup(p, var_interface);
      }
      else if (strEQ(var, "LIBRARY_INTERFACE")) {
 -        result = apr_pstrdup(p, library_interface);
-+        result = apr_pstrdup(p, var_library_interface);
++        return apr_pstrdup(p, var_library_interface);
      }
      else if (strEQ(var, "LIBRARY")) {
 -        result = apr_pstrdup(p, library);
-+        result = apr_pstrdup(p, var_library);
+-    }
+-    else {
+-        result = NULL;
++        return apr_pstrdup(p, var_library);
      }
-     else {
-         result = NULL;
+-    return result;
++
++    return NULL;
+ }
+   
+ 
+--- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
++++ httpd-2.2.6/modules/ssl/ssl_private.h
+@@ -648,7 +648,7 @@ void         ssl_die(void);
+ void         ssl_log_ssl_error(const char *, int, int, server_rec *);
+ 
+ /**  Variables  */
+-void         ssl_var_register(void);
++void         ssl_var_register(apr_pool_t *p);
+ char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
+ const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
+ 
diff --git a/httpd.spec b/httpd.spec
index 4caa34e..5933af7 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -232,7 +232,7 @@ for f in ssl.conf welcome.conf manual.conf proxy_ajp.conf; do
 done
 
 rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
-install -m -p 644 $RPM_SOURCE_DIR/httpd.conf \
+install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
 
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@@ -258,7 +258,8 @@ echo %{mmn} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
 
 # docroot
 mkdir $RPM_BUILD_ROOT%{contentdir}/html
-install -m 644 noindex.html $RPM_BUILD_ROOT%{contentdir}/error/noindex.html
+install -m 644 -p $RPM_SOURCE_DIR/index.html \
+        $RPM_BUILD_ROOT%{contentdir}/error/noindex.html
 
 # remove manual sources
 find $RPM_BUILD_ROOT%{contentdir}/manual \( \