rpms/httpd/devel httpd-2.2.6-ssllibver.patch, 1.1, 1.2 httpd.spec, 1.116, 1.117
Joe Orton (jorton)
fedora-extras-commits at redhat.com
Tue Sep 18 07:49:34 UTC 2007
Author: jorton
Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13671
Modified Files:
httpd-2.2.6-ssllibver.patch httpd.spec
Log Message:
- fixes for previous commit
httpd-2.2.6-ssllibver.patch:
Index: httpd-2.2.6-ssllibver.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.2.6-ssllibver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.2.6-ssllibver.patch 17 Sep 2007 19:02:35 -0000 1.1
+++ httpd-2.2.6-ssllibver.patch 18 Sep 2007 07:48:57 -0000 1.2
@@ -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);
+
Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- httpd.spec 17 Sep 2007 19:02:35 -0000 1.116
+++ httpd.spec 18 Sep 2007 07:48:57 -0000 1.117
@@ -232,7 +232,7 @@
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 @@
# 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 \( \
More information about the fedora-extras-commits
mailing list