forked from pool/apache2
Accepting request 71347 from home:elvigia:branches:Apache
- Update to 2.2.19, only one bugfix.
*) Revert ABI breakage in 2.2.18 caused by the function signature change
of ap_unescape_url_keep2f(). This release restores the signature from
2.2.17 and prior, and introduces ap_unescape_url_keep2f_ex().
[Eric Covener]
- Remove SSLv2 disabled patch, already in upstream.
- Update to version 2.2.18
* mod_ssl, ab: Support OpenSSL compiled without SSLv2 support.
* core: Treat timeout reading request as 408 error, not 400.
* core: Only log a 408 if it is no keepalive timeout.
* mod_rewrite: Allow to unset environment variables.
* prefork: Update MPM state in children during a graceful restart.
* Other fixes in mod_cache,mod_dav,mod_proxy se NEWS for detail.
- Fix regular expression in vhost ssl template IE workaround
it is obsolete see https://issues.apache.org/bugzilla/show_bug.cgi?id=49484
You should apply this update to fix painfully slow SSL
connections when using IE.
- Allow usage of an openSSL library compiled without SSlv2
OBS-URL: https://build.opensuse.org/request/show/71347
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=331
This commit is contained in:
Git OBS Bridge
parent
0eb627382f
commit
9b65a485e9
@ -182,7 +182,7 @@
|
||||
# Similarly, one has to force some clients to use HTTP/1.0 to workaround
|
||||
# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
|
||||
# "force-response-1.0" for this.
|
||||
SetEnvIf User-Agent ".*MSIE.*" \
|
||||
SetEnvIf User-Agent ".*MSIE [1-5].*" \
|
||||
nokeepalive ssl-unclean-shutdown \
|
||||
downgrade-1.0 force-response-1.0
|
||||
|
||||
|
||||
@ -1,22 +1,20 @@
|
||||
unchanged:
|
||||
--- httpd-2.2.11/server/mpm/experimental/itk/Makefile.in 2009-03-17 21:38:54.000000000 +0100
|
||||
+++ httpd-2.2.11/server/mpm/experimental/itk/Makefile.in 2009-03-17 21:39:03.000000000 +0100
|
||||
--- /dev/null
|
||||
+++ server/mpm/experimental/itk/Makefile.in
|
||||
@@ -0,0 +1,5 @@
|
||||
+
|
||||
+LTLIBRARY_NAME = libitk.la
|
||||
+LTLIBRARY_SOURCES = itk.c
|
||||
+
|
||||
+include $(top_srcdir)/build/ltlib.mk
|
||||
unchanged:
|
||||
--- httpd-2.2.11/server/mpm/experimental/itk/config.m4 2009-03-17 21:38:53.000000000 +0100
|
||||
+++ httpd-2.2.11/server/mpm/experimental/itk/config.m4 2009-03-17 21:39:03.000000000 +0100
|
||||
--- /dev/null
|
||||
+++ server/mpm/experimental/itk/config.m4
|
||||
@@ -0,0 +1,3 @@
|
||||
+if test "$MPM_NAME" = "itk" ; then
|
||||
+ APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
|
||||
+ APACHE_FAST_OUTPUT(server/mpm/$MPM_SUBDIR_NAME/Makefile)
|
||||
+fi
|
||||
diff -u httpd-2.2.11/server/mpm/experimental/itk/itk.c httpd-2.2.11/server/mpm/experimental/itk/itk.c
|
||||
--- httpd-2.2.11/server/mpm/experimental/itk/itk.c 2009-04-14 23:29:16.000000000 +0200
|
||||
+++ httpd-2.2.11/server/mpm/experimental/itk/itk.c 2009-04-14 23:31:05.000000000 +0200
|
||||
--- /dev/null
|
||||
+++ server/mpm/experimental/itk/itk.c
|
||||
@@ -0,0 +1,1740 @@
|
||||
+/* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
+ * contributor license agreements. See the NOTICE file distributed with
|
||||
@ -1758,9 +1756,8 @@ diff -u httpd-2.2.11/server/mpm/experimental/itk/itk.c httpd-2.2.11/server/mpm/e
|
||||
+ itk_cmds, /* command apr_table_t */
|
||||
+ itk_hooks, /* register hooks */
|
||||
+};
|
||||
unchanged:
|
||||
--- httpd-2.2.11/server/mpm/experimental/itk/mpm.h 2009-03-17 21:39:03.000000000 +0100
|
||||
+++ httpd-2.2.11/server/mpm/experimental/itk/mpm.h 2009-03-21 13:02:33.000000000 +0100
|
||||
--- /dev/null
|
||||
+++ server/mpm/experimental/itk/mpm.h
|
||||
@@ -0,0 +1,68 @@
|
||||
+/* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
+ * contributor license agreements. See the NOTICE file distributed with
|
||||
@ -1830,9 +1827,8 @@ unchanged:
|
||||
+extern server_rec *ap_server_conf;
|
||||
+#endif /* APACHE_MPM_ITK_H */
|
||||
+/** @} */
|
||||
unchanged:
|
||||
--- httpd-2.2.11/server/mpm/experimental/itk/mpm_default.h 2009-03-17 21:39:03.000000000 +0100
|
||||
+++ httpd-2.2.11/server/mpm/experimental/itk/mpm_default.h 2009-03-21 13:02:33.000000000 +0100
|
||||
--- /dev/null
|
||||
+++ server/mpm/experimental/itk/mpm_default.h
|
||||
@@ -0,0 +1,80 @@
|
||||
+/* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
+ * contributor license agreements. See the NOTICE file distributed with
|
||||
@ -1914,19 +1910,18 @@ unchanged:
|
||||
+
|
||||
+#endif /* AP_MPM_DEFAULT_H */
|
||||
+/** @} */
|
||||
unchanged:
|
||||
--- apache2.2.orig/server/mpm/config.m4 2007-01-29 21:30:26.000000000 +0100
|
||||
+++ apache2.2/server/mpm/config.m4 2007-01-29 21:30:35.000000000 +0100
|
||||
--- server/mpm/config.m4.orig
|
||||
+++ server/mpm/config.m4
|
||||
@@ -1,7 +1,7 @@
|
||||
AC_MSG_CHECKING(which MPM to use)
|
||||
AC_ARG_WITH(mpm,
|
||||
APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use.
|
||||
- MPM={beos|event|worker|prefork|mpmt_os2}),[
|
||||
+ MPM={beos|event|worker|prefork|mpmt_os2|itk}),[
|
||||
- MPM={beos|event|worker|prefork|mpmt_os2|winnt}),[
|
||||
+ MPM={beos|event|worker|prefork|mpmt_os2|winnt|itk}),[
|
||||
APACHE_MPM=$withval
|
||||
],[
|
||||
if test "x$APACHE_MPM" = "x"; then
|
||||
@@ -23,7 +23,7 @@
|
||||
@@ -23,7 +23,7 @@ ap_mpm_is_threaded ()
|
||||
|
||||
ap_mpm_is_experimental ()
|
||||
{
|
||||
@ -1935,17 +1930,20 @@ unchanged:
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
unchanged:
|
||||
--- apache2.2.orig/server/mpm/experimental/itk/config.m4 2007-01-29 21:03:51.000000000 +0100
|
||||
+++ apache2.2/server/mpm/experimental/itk/config.m4 2007-01-29 21:03:57.000000000 +0100
|
||||
@@ -1,3 +1,3 @@
|
||||
if test "$MPM_NAME" = "itk" ; then
|
||||
- APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
|
||||
+ APACHE_FAST_OUTPUT(server/mpm/$MPM_SUBDIR_NAME/Makefile)
|
||||
@@ -66,6 +66,11 @@ if ap_mpm_is_experimental; then
|
||||
else
|
||||
MPM_SUBDIR_NAME=$MPM_NAME
|
||||
fi
|
||||
unchanged:
|
||||
--- httpd-2.2.11/include/http_request.h 2009-03-21 13:03:31.000000000 +0100
|
||||
+++ httpd-2.2.11/include/http_request.h 2009-03-21 13:03:41.000000000 +0100
|
||||
+
|
||||
+if test "$apache_cv_mpm" = "itk" ; then
|
||||
+ AC_CHECK_LIB(cap, cap_init)
|
||||
+fi
|
||||
+
|
||||
MPM_DIR=server/mpm/$MPM_SUBDIR_NAME
|
||||
MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
|
||||
|
||||
--- include/http_request.h.orig
|
||||
+++ include/http_request.h
|
||||
@@ -12,6 +12,12 @@
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
@ -1959,7 +1957,7 @@ unchanged:
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -350,6 +356,15 @@
|
||||
@@ -350,6 +356,15 @@ AP_DECLARE_HOOK(int,auth_checker,(reques
|
||||
*/
|
||||
AP_DECLARE_HOOK(void,insert_filter,(request_rec *r))
|
||||
|
||||
@ -1975,9 +1973,8 @@ unchanged:
|
||||
AP_DECLARE(int) ap_location_walk(request_rec *r);
|
||||
AP_DECLARE(int) ap_directory_walk(request_rec *r);
|
||||
AP_DECLARE(int) ap_file_walk(request_rec *r);
|
||||
unchanged:
|
||||
--- httpd-2.2.11/server/request.c 2009-03-21 13:03:13.000000000 +0100
|
||||
+++ httpd-2.2.11/server/request.c 2009-03-21 13:03:41.000000000 +0100
|
||||
--- server/request.c.orig
|
||||
+++ server/request.c
|
||||
@@ -12,6 +12,12 @@
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
@ -1991,7 +1988,7 @@ unchanged:
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -61,6 +67,7 @@
|
||||
@@ -61,6 +67,7 @@ APR_HOOK_STRUCT(
|
||||
APR_HOOK_LINK(auth_checker)
|
||||
APR_HOOK_LINK(insert_filter)
|
||||
APR_HOOK_LINK(create_request)
|
||||
@ -1999,7 +1996,7 @@ unchanged:
|
||||
)
|
||||
|
||||
AP_IMPLEMENT_HOOK_RUN_FIRST(int,translate_name,
|
||||
@@ -80,6 +87,8 @@
|
||||
@@ -80,6 +87,8 @@ AP_IMPLEMENT_HOOK_RUN_FIRST(int,auth_che
|
||||
AP_IMPLEMENT_HOOK_VOID(insert_filter, (request_rec *r), (r))
|
||||
AP_IMPLEMENT_HOOK_RUN_ALL(int, create_request,
|
||||
(request_rec *r), (r), OK, DECLINED)
|
||||
@ -2008,7 +2005,7 @@ unchanged:
|
||||
|
||||
|
||||
static int decl_die(int status, char *phase, request_rec *r)
|
||||
@@ -158,6 +167,13 @@
|
||||
@@ -158,6 +167,13 @@ AP_DECLARE(int) ap_process_request_inter
|
||||
return access_status;
|
||||
}
|
||||
|
||||
@ -2022,18 +2019,3 @@ unchanged:
|
||||
/* Only on the main request! */
|
||||
if (r->main == NULL) {
|
||||
if ((access_status = ap_run_header_parser(r))) {
|
||||
unchanged:
|
||||
--- httpd-2.2.11.orig/server/mpm/config.m4 2009-04-14 23:26:41.000000000 +0200
|
||||
+++ httpd-2.2.11/server/mpm/config.m4 2009-04-14 23:28:03.000000000 +0200
|
||||
@@ -66,6 +66,11 @@
|
||||
else
|
||||
MPM_SUBDIR_NAME=$MPM_NAME
|
||||
fi
|
||||
+
|
||||
+if test "$apache_cv_mpm" = "itk" ; then
|
||||
+ AC_CHECK_LIB(cap, cap_init)
|
||||
+fi
|
||||
+
|
||||
MPM_DIR=server/mpm/$MPM_SUBDIR_NAME
|
||||
MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
|
||||
|
||||
|
||||
@ -1,3 +1,37 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 26 03:35:05 UTC 2011 - crrodriguez@opensuse.org
|
||||
|
||||
- Update to 2.2.19, only one bugfix.
|
||||
*) Revert ABI breakage in 2.2.18 caused by the function signature change
|
||||
of ap_unescape_url_keep2f(). This release restores the signature from
|
||||
2.2.17 and prior, and introduces ap_unescape_url_keep2f_ex().
|
||||
[Eric Covener]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 20 19:28:03 UTC 2011 - crrodriguez@opensuse.org
|
||||
|
||||
- Remove SSLv2 disabled patch, already in upstream.
|
||||
- Update to version 2.2.18
|
||||
* mod_ssl, ab: Support OpenSSL compiled without SSLv2 support.
|
||||
* core: Treat timeout reading request as 408 error, not 400.
|
||||
* core: Only log a 408 if it is no keepalive timeout.
|
||||
* mod_rewrite: Allow to unset environment variables.
|
||||
* prefork: Update MPM state in children during a graceful restart.
|
||||
* Other fixes in mod_cache,mod_dav,mod_proxy se NEWS for detail.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 20 23:24:26 UTC 2011 - crrodriguez@opensuse.org
|
||||
|
||||
- Fix regular expression in vhost ssl template IE workaround
|
||||
it is obsolete see https://issues.apache.org/bugzilla/show_bug.cgi?id=49484
|
||||
You should apply this update to fix painfully slow SSL
|
||||
connections when using IE.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 11 16:19:14 UTC 2011 - crrodriguez@opensuse.org
|
||||
|
||||
- Allow usage of an openSSL library compiled without SSlv2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 8 13:41:48 UTC 2011 - lnussel@suse.de
|
||||
|
||||
|
||||
@ -67,8 +67,8 @@ BuildRequires: expat-devel
|
||||
%define platform_string Linux/%VENDOR
|
||||
License: ASLv..
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
%define realver 2.2.17
|
||||
Version: 2.2.17
|
||||
%define realver 2.2.19
|
||||
Version: 2.2.19
|
||||
Release: 1
|
||||
#Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2
|
||||
Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
|
||||
@ -339,7 +339,7 @@ to administrators of web servers in general.
|
||||
%patch66 -p1
|
||||
%patch67 -p1
|
||||
%patch68 -p1
|
||||
%patch100 -p1
|
||||
%patch100
|
||||
#
|
||||
cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
|
||||
#
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04
|
||||
size 4951247
|
||||
3
httpd-2.2.19.tar.bz2
Normal file
3
httpd-2.2.19.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a1c1185371ef6b5bb9dbeaff9cd6d6e82c566f1cb472d247d212245ceacc7f1e
|
||||
size 5322082
|
||||
Loading…
x
Reference in New Issue
Block a user