From: Christophe Jaillet Date: Sat, 25 Dec 2021 13:58:16 +0000 (+0000) Subject: Fix some typos X-Git-Tag: 2.5.0-alpha2-ci-test-only~609 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a8e5869c6bcbbf6a804467fa57c72386c442ef7;p=thirdparty%2Fapache%2Fhttpd.git Fix some typos [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1896386 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/test/modules/http2/mod_h2test/mod_h2test.c b/test/modules/http2/mod_h2test/mod_h2test.c index b65f1df6f76..63dc28aac43 100644 --- a/test/modules/http2/mod_h2test/mod_h2test.c +++ b/test/modules/http2/mod_h2test/mod_h2test.c @@ -220,7 +220,7 @@ static int h2test_delay_handler(request_rec *r) cleanup: ap_log_rerror(APLOG_MARK, APLOG_TRACE1, rv, r, - "delay_handler: request cleanup, r->status=%d, aborte=%d", + "delay_handler: request cleanup, r->status=%d, aborted=%d", r->status, c->aborted); if (rv == APR_SUCCESS || r->status != HTTP_OK diff --git a/test/modules/http2/test_004_post.py b/test/modules/http2/test_004_post.py index 3e17b7233b3..1a52623a9a9 100644 --- a/test/modules/http2/test_004_post.py +++ b/test/modules/http2/test_004_post.py @@ -180,7 +180,7 @@ CustomLog logs/test_004_30 issue_203 assert log_h2_full['bytes_rx_I'] > 0 assert log_h2_full['bytes_resp_B'] == full_length assert log_h2_full['bytes_tx_O'] > full_length - assert log_h1['bytes_rx_I'] > 0 # input bytes recieved + assert log_h1['bytes_rx_I'] > 0 # input bytes received assert log_h1['bytes_resp_B'] == chunk # response bytes sent (payload) assert log_h1['bytes_tx_O'] > chunk # output bytes sent assert log_h2['bytes_rx_I'] > 0 diff --git a/test/modules/http2/test_400_push.py b/test/modules/http2/test_400_push.py index 5c62c20857c..1d7410031da 100644 --- a/test/modules/http2/test_400_push.py +++ b/test/modules/http2/test_400_push.py @@ -87,7 +87,7 @@ class TestPush: assert 1 == len(promises) assert '/006/006.js' == promises[0]["request"]["header"][":path"] - # 2 Links, only one with correct rel attribue + # 2 Links, only one with correct rel attribute def test_h2_400_03(self, env): url = env.mkurl("https", "push", "/006-push3.html") r = env.nghttp().get(url) diff --git a/test/modules/md/test_310_conf_store.py b/test/modules/md/test_310_conf_store.py index 69a086ebd92..f2bb9c723ac 100644 --- a/test/modules/md/test_310_conf_store.py +++ b/test/modules/md/test_310_conf_store.py @@ -752,7 +752,7 @@ class TestConf: # setup: drive it r = env.a2md(["-v", "drive", name]) - assert r.exit_code == 0, "drive not successfull: {0}".format(r.stderr) + assert r.exit_code == 0, "drive not successful: {0}".format(r.stderr) assert env.a2md(["list", name]).json['output'][0]['state'] == env.MD_S_COMPLETE # remove one domain -> status stays COMPLETE diff --git a/test/modules/md/test_720_wildcard.py b/test/modules/md/test_720_wildcard.py index c440a0ce231..07d0dcadca3 100644 --- a/test/modules/md/test_720_wildcard.py +++ b/test/modules/md/test_720_wildcard.py @@ -1,4 +1,4 @@ -# test wildcard certifcates +# test wildcard certificates import os import pytest diff --git a/test/modules/md/test_810_ec.py b/test/modules/md/test_810_ec.py index f8480dd4ada..5c310180a85 100644 --- a/test/modules/md/test_810_ec.py +++ b/test/modules/md/test_810_ec.py @@ -90,7 +90,7 @@ class TestAutov2: # use a curve unsupported by LE # only works with mod_ssl as rustls refuses to load such a weak key @pytest.mark.skipif(MDTestEnv.get_ssl_module() != "mod_ssl", reason="only for mod_ssl") - @pytest.mark.skipif(MDTestEnv.get_acme_server() != 'boulder', reason="onyl boulder rejects this") + @pytest.mark.skipif(MDTestEnv.get_acme_server() != 'boulder', reason="only boulder rejects this") def test_md_810_004(self, env): domain = self.test_domain # generate config with one MD diff --git a/test/modules/md/test_920_status.py b/test/modules/md/test_920_status.py index d8b2edea70f..36c520ac94b 100644 --- a/test/modules/md/test_920_status.py +++ b/test/modules/md/test_920_status.py @@ -217,13 +217,13 @@ Protocols h2 http/1.1 acme-tls/1 conf.install() assert env.apache_restart() == 0 assert env.await_completion([domain], restart=False) - # In the stats JSON, we excpect 2 certificates under 'renewal' + # In the stats JSON, we expect 2 certificates under 'renewal' stat = env.get_md_status(domain) assert 'renewal' in stat assert 'cert' in stat['renewal'] assert 'rsa' in stat['renewal']['cert'] assert 'secp256r1' in stat['renewal']['cert'] - # In /.httpd/certificate-status 'renewal' we excpect 2 certificates + # In /.httpd/certificate-status 'renewal' we expect 2 certificates status = env.get_certificate_status(domain) assert 'renewal' in status assert 'cert' in status['renewal'] diff --git a/test/modules/tls/test_03_sni.py b/test/modules/tls/test_03_sni.py index 2873b65fb9c..eda9a33adb2 100644 --- a/test/modules/tls/test_03_sni.py +++ b/test/modules/tls/test_03_sni.py @@ -36,7 +36,7 @@ class TestSni: assert r.exit_code != 0 def test_03_sni_request_other_same_config(self, env): - # do we see the first vhost respone for another domain with different certs? + # do we see the first vhost response for another domain with different certs? r = env.tls_get(env.domain_a, "/index.json", options=[ "-vvvv", "--header", "Host: {0}".format(env.domain_b) ]) @@ -49,7 +49,7 @@ class TestSni: if env.curl_supports_tls_1_3(): # can't do this test then return - # do we see the first vhost respone for an unknown domain? + # do we see the first vhost response for an unknown domain? conf = TlsTestConf(env=env, extras={ env.domain_a: "TLSProtocol TLSv1.2+", env.domain_b: "TLSProtocol TLSv1.3+" diff --git a/test/modules/tls/test_06_ciphers.py b/test/modules/tls/test_06_ciphers.py index 60a5e20b90d..650c0dabeaf 100644 --- a/test/modules/tls/test_06_ciphers.py +++ b/test/modules/tls/test_06_ciphers.py @@ -175,7 +175,7 @@ class TestCiphers: env.apache_restart() def test_06_ciphers_pref_unsupported(self, env): - # a warning on prefering a known, but not supported cipher + # a warning on preferring a known, but not supported cipher env.httpd_error_log.ignore_recent() conf = TlsTestConf(env=env, extras={ env.domain_b: "TLSCiphersPrefer TLS_NULL_WITH_NULL_NULL"