Accepting request 945511 from Apache
- Add apache2-perl-io-socket.patch: t/ssl/ocsp.t: Handle new error message raised by IO-Socket-SSL 2.073. Fixes build with Perl-IO-socket-SSL 2.073, as currently staged in :E (forwarded request 945399 from dimstar) OBS-URL: https://build.opensuse.org/request/show/945511 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=190
This commit is contained in:
commit
88d65b6db8
37
apache2-perl-io-socket.patch
Normal file
37
apache2-perl-io-socket.patch
Normal file
@ -0,0 +1,37 @@
|
||||
--- httpd/test/framework/trunk/t/ssl/ocsp.t 2022/01/10 15:44:45 1896888
|
||||
+++ httpd/test/framework/trunk/t/ssl/ocsp.t 2022/01/10 18:08:12 1896889
|
||||
@@ -32,13 +32,21 @@ sok {
|
||||
$r = GET $url, cert => undef;
|
||||
my $message = $r->content() || '';
|
||||
my $warning = $r->header('Client-Warning') || '';
|
||||
+ print "warning: $warning\n";
|
||||
+ print "message: $message";
|
||||
+ print "response:\n";
|
||||
print $r->as_string;
|
||||
$r->code == 500 && $warning =~ 'Internal response' &&
|
||||
- $message =~ /alert handshake failure|read failed/;
|
||||
+ $message =~ /alert handshake failure|read failed|closed connection without sending any data/;
|
||||
};
|
||||
|
||||
sok {
|
||||
$r = GET $url, cert => 'client_ok';
|
||||
+ my $warning = $r->header('Client-Warning') || '';
|
||||
+ my $message = $r->content() || '';
|
||||
+ print "warning: $warning\n";
|
||||
+ print "message: $message";
|
||||
+ print "response:\n";
|
||||
print $r->as_string;
|
||||
$r->code == 200;
|
||||
};
|
||||
@@ -47,7 +55,10 @@ sok {
|
||||
$r = GET $url, cert => 'client_revoked';
|
||||
my $message = $r->content() || '';
|
||||
my $warning = $r->header('Client-Warning') || '';
|
||||
+ print "warning: $warning\n";
|
||||
+ print "message: $message";
|
||||
+ print "response:\n";
|
||||
print $r->as_string;
|
||||
$r->code == 500 && $warning =~ 'Internal response' &&
|
||||
- $message =~ /alert certificate revoked|read failed/;
|
||||
+ $message =~ /alert handshake failure|read failed|closed connection without sending any data/;
|
||||
};
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 10 18:12:38 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Add apache2-perl-io-socket.patch: t/ssl/ocsp.t: Handle new error
|
||||
message raised by IO-Socket-SSL 2.073.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 20 11:26:49 UTC 2021 - David Anes <david.anes@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -200,6 +200,8 @@ Patch100: apache-test-application-xml-type.patch
|
||||
Patch101: apache-test-turn-off-variables-in-ssl-var-lookup.patch
|
||||
# PATCH: reverted logic, DirectorySlash NotFound is available in trunk onlyyet
|
||||
Patch102: apache-test-DirectorySlash-NotFound-logic.patch
|
||||
# https://svn.apache.org/viewvc?view=revision&revision=1896889
|
||||
Patch103: apache2-perl-io-socket.patch
|
||||
BuildRequires: apache-rpm-macros-control
|
||||
#Since 2.4.7 the event MPM requires apr 1.5.0 or later.
|
||||
BuildRequires: apr-devel >= 1.5.0
|
||||
@ -329,6 +331,9 @@ provides HTTP services in sync with the current HTTP standards.
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
(cd httpd-framework
|
||||
%patch103 -p4
|
||||
)
|
||||
|
||||
#
|
||||
# BUILD
|
||||
|
Loading…
Reference in New Issue
Block a user