Passed: apache/httpd#389 (2.4.x - d865940)
Build Update for apache/httpd - Build: #389 Status: Passed Duration: 12 mins and 19 secs Commit: d865940 (2.4.x) Author: Graham Leggett Message: mpm_event: avoid possible KeepAlveTimeout off by -100 ms. trunk patch: http://svn.apache.org/r1874277 2.4.x patch: svn merge -c 1874277 ^/httpd/httpd/trunk . +1: ylavic, covener, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874350 13f79535-47bb-0310-9956-ffa450edef68 View the changeset: https://github.com/apache/httpd/compare/49df822852b7...d865940caa3a View the full build log and details: https://travis-ci.org/apache/httpd/builds/653692615?utm_medium=notification&utm_source=email -- You can unsubscribe from build emails from the apache/httpd repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=69847&utm_medium=notification&utm_source=email. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notification&utm_source=email. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.
Re: Branches 2.4.12-dev fails mod_ssl
On Fri, Feb 21, 2020 at 5:02 PM Steffen wrote: > > It works. Thanks for testing. > > Patch Output mod_ssl.c: Looks good. > > How to test that the new OPENSSL_init_ssl() API, for OpenSSL = 1.1. is used ? It is used provided the version is >= 1.1.0. Runtime testing would be to make sure stop/restart/graceful don't crash when mod_ssl is linked dynamically (with LoadModule). Regards, Yann.
Re: Branches 2.4.12-dev fails mod_ssl
It works. Builds against 1.1.1 and runs with r1874323, Attached the two files, so you can check that the patch is ok ? (With Windows sometimes Patch gets confused) Patch Output mod_ssl.c: patching file modules/ssl/mod_ssl.c Hunk #2 succeeded at 328 (offset -6 lines). patch unexpectedly ends in middle of line Hunk #3 succeeded at 395 with fuzz 1 (offset -9 lines). How to test that the new OPENSSL_init_ssl() API, for OpenSSL = 1.1. is used ? Steffen On Friday 21/02/2020 at 15:38, Yann Ylavic wrote: On Fri, Feb 21, 2020 at 2:39 PM Ruediger Pluem wrote: So we need to have a solution in place that works on Windows and Unix and I believe the solution from Yann does. What about r1874323 ? Using "ap_config.h" would exclude Windows from the new OPENSSL_init_ssl() API, even for OpenSSL >= 1.1. Steffen, would you please try 2.4.x + r1874323 (with OpenSSL 1.1+) and see if it works? Regards, Yann. ssl_private.h Description: Binary data mod_ssl.c Description: Binary data
Re: Branches 2.4.12-dev fails mod_ssl
Il giorno ven 21 feb 2020 alle ore 13:36 Ruediger Pluem ha scritto: > > > > On 02/21/2020 11:14 AM, Yann Ylavic wrote: > > Hi Steffen, > > > > On Fri, Feb 21, 2020 at 10:23 AM Steffen wrote: > >> > >> Building revision 1874291 failed in Windows. > >> > >> mod_ssl.c(27,10): fatal error C1083: Cannot open include file: > >> 'ap_config_auto.h': No such file or directory > > > > Better if you #include "ap_config.h" instead? > > > > This should work. Care to apply? > BTW: Is there any possibility to have a Travis job run on Windows to catch > these? There is an open email thread about it, the work to be done is not very easy in my opinion if you are not an expert of building on Windows. I didn't have time to dive into it yet, but if anybody wants to send a pull request or commit something please do! :) Luca
Re: Branches 2.4.12-dev fails mod_ssl
On Fri, Feb 21, 2020 at 2:39 PM Ruediger Pluem wrote: > > So we need to have a solution in place that works on Windows and Unix and I > believe the solution from Yann does. What about r1874323 ? Using "ap_config.h" would exclude Windows from the new OPENSSL_init_ssl() API, even for OpenSSL >= 1.1. Steffen, would you please try 2.4.x + r1874323 (with OpenSSL 1.1+) and see if it works? Regards, Yann.
Re: Branches 2.4.12-dev fails mod_ssl
On 02/21/2020 02:23 PM, Steffen wrote: > I run without it. > > Does that have a draw back ? Removing it likely breaks the Unix builds. So we need to have a solution in place that works on Windows and Unix and I believe the solution from Yann does. Hence it would be very helpful if you could verify this part of the assumption on Windows side. I guess their are plenty of people here (as well as our current Travis jobs) who can verify for the Unix side, but not much for the Windows side. Regards Rüdiger
Re: Branches 2.4.12-dev fails mod_ssl
I run without it. Does that have a draw back ? Steffen > Op 21 feb. 2020 om 13:36 heeft Ruediger Pluem het > volgende geschreven: > > > >> On 02/21/2020 11:14 AM, Yann Ylavic wrote: >> Hi Steffen, >> >>> On Fri, Feb 21, 2020 at 10:23 AM Steffen wrote: >>> >>> Building revision 1874291 failed in Windows. >>> >>> mod_ssl.c(27,10): fatal error C1083: Cannot open include file: >>> 'ap_config_auto.h': No such file or directory >> >> Better if you #include "ap_config.h" instead? >> > > This should work. Care to apply? > BTW: Is there any possibility to have a Travis job run on Windows to catch > these? > > Regards > > Rüdiger
Re: Branches 2.4.12-dev fails mod_ssl
On 02/21/2020 11:14 AM, Yann Ylavic wrote: > Hi Steffen, > > On Fri, Feb 21, 2020 at 10:23 AM Steffen wrote: >> >> Building revision 1874291 failed in Windows. >> >> mod_ssl.c(27,10): fatal error C1083: Cannot open include file: >> 'ap_config_auto.h': No such file or directory > > Better if you #include "ap_config.h" instead? > This should work. Care to apply? BTW: Is there any possibility to have a Travis job run on Windows to catch these? Regards Rüdiger
Re: Netcraft
Jim, On 21 Feb 2020, at 13:20, Jim Jagielski wrote: > Wow. Was Netcraft actually somewhat kind to Apache httpd? They actually > admitted some areas where httpd is doing better, and still does better, > market-share wise, than nginx. They are very kind (and professional) people. And the pub in Bath is great (and it is one of the most lovely cities in England too) - I am sure they would not mind showing you around. Dw.
Netcraft
Wow. Was Netcraft actually somewhat kind to Apache httpd? They actually admitted some areas where httpd is doing better, and still does better, market-share wise, than nginx.
Re: svn commit: r1874132 - in /httpd/httpd/trunk: ./ modules/md/
Ah, thanks for catching this, Yann.
> Am 21.02.2020 um 10:49 schrieb Yann Ylavic :
>
> Hi Stefan,
>
> it seems that this commit reverts some of the spellcheck fixes from
> Mike, see below hunks.
> Both this commit (w/o the revert) and the typos have been backported
> to 2.4.x, so "restore" needed in trunk only.
>
> Cheers,
> Yann.
>
>
>> --- httpd/httpd/trunk/modules/md/md_acme_order.c (original)
>> +++ httpd/httpd/trunk/modules/md/md_acme_order.c Mon Feb 17 14:05:03 2020
>> @@ -513,7 +513,7 @@ static apr_status_t check_challenges(voi
>> rv = APR_EINVAL;
>> if (!authz->error_type) {
>> md_result_printf(ctx->result, rv,
>> - "domain authorization for %s
>> failed, CA considers "
>> + "domain authorization for %s
>> failed, CA consideres "
>
>> --- httpd/httpd/trunk/modules/md/md_acmev1_drive.c (original)
>> +++ httpd/httpd/trunk/modules/md/md_acmev1_drive.c Mon Feb 17 14:05:03 2020
>> @@ -49,7 +49,7 @@
>> * Pre-Req: we have an account for the ACME server that has accepted the
>> current license agreement
>> * For each domain in MD:
>> * - check if there already is a valid AUTHZ resource
>> - * - if not, create an AUTHZ resource with challenge data
>> + * - if ot, create an AUTHZ resource with challenge data
>
>> --- httpd/httpd/trunk/modules/md/md_crypt.h (original)
>> +++ httpd/httpd/trunk/modules/md/md_crypt.h Mon Feb 17 14:05:03 2020
>> @@ -100,7 +100,7 @@ typedef enum {
>> } md_cert_state_t;
>>
>> /**
>> - * Create a holder of the certificate that will free its memory when the
>> + * Create a holder of the certificate that will free its memmory when the
>
>> --- httpd/httpd/trunk/modules/md/md_http.h (original)
>> +++ httpd/httpd/trunk/modules/md/md_http.h Mon Feb 17 14:05:03 2020
>> @@ -86,7 +86,7 @@ apr_status_t md_http_create(md_http_t **
>> void md_http_set_response_limit(md_http_t *http, apr_off_t resp_limit);
>>
>> /**
>> - * Set the timeout for the complete request. This needs to take everything
>> from
>> + * Set the timeout for the complete reqest. This needs to take everything
>> from
>
>> @@ -134,7 +134,7 @@ void md_http_set_on_status_cb(md_http_re> void
>> md_http_set_on_response_cb(md_http_request_t *req, md_http_response_cb *cb,
>> void *baton);
>>
>> /**
>> - * Create a GET request.
>> + * Create a GET reqest.
>
>> @@ -144,7 +144,7 @@ apr_status_t md_http_GET_create(md_http_>
>> struct apr_table_t *headers);
>>
>> /**
>> - * Create a HEAD request.
>> + * Create a HEAD reqest.
>
>> @@ -154,7 +154,7 @@ apr_status_t md_http_HEAD_create(md_http>
>>struct apr_table_t *headers);
>>
>> /**
>> - * Create a POST request with a bucket brigade as request body.
>> + * Create a POST reqest with a bucket brigade as request body.
>
>> @@ -168,7 +168,7 @@ apr_status_t md_http_POST_create(md_http>
>>struct apr_bucket_brigade *body, int detect_len);
>>
>> /**
>> - * Create a POST request with known request body data.
>> + * Create a POST reqest with known request body data.
>
>> @@ -213,7 +213,7 @@ typedef apr_status_t md_http_next_req(md> * To limit
>> the number of parallel requests, nextreq should return APR_ENOENT when the
>> limit
>> * is reached. It will be called again when the number of in_flight requests
>> changes.
>> *
>> - * When all requests are done, nextreq will be called one more time. Should
>> it not
>> + * When all reqests are done, nextreq will be called one more time. Should
>> it not
>
>> --- httpd/httpd/trunk/modules/md/md_reg.c (original)> +++
>> httpd/httpd/trunk/modules/md/md_reg.c Mon Feb 17 14:05:03 2020
>> @@ -670,7 +670,7 @@ int md_reg_should_warn(md_reg_t *reg, co
>> }
>>
>> /**/
>> -/* syncing */
>> +/* synching */
>
>> @@ -836,7 +836,7 @@ leave:
>> }
>>
>> /**
>> - * Finish syncing an MD with the store.
>> + * Finish synching an MD with the store.
>
>> --- httpd/httpd/trunk/modules/md/md_reg.h (original)
>> +++ httpd/httpd/trunk/modules/md/md_reg.h Mon Feb 17 14:05:03 2020
>> @@ -145,7 +145,7 @@ apr_status_t md_reg_delete_acct(md_reg_t
>> * Cleanup any challenges that are no longer in use.
>> *
>> * @param reg the registry
>> - * @param p pool for permanent storage
>> + * @param p pool for permament storage
>
>> @@ -160,7 +160,7 @@ apr_status_t md_reg_cleanup_challenges(m
>> apr_status_t md_reg_freeze_domains(md_reg_t *reg, apr_array_header_t *mds);
>>
>> /**
>> - * Return if the certificate of the MD should be renewed. This includes
>> reaching
>> + * Return if the certificate of the MD shoud be renewed. This includes
>> reaching
>
>> @@ -222,7 +222,7 @@ struct md_proto_t {
>> };
>>
>> /**
>> - * Run a test initialization of the renew protocol for the given MD. This
>>
Re: Branches 2.4.12-dev fails mod_ssl
Yesterday it was building fine (before 1874281 ), was no ap_config.. So I removed #include "ap_config_auto.h", builds and runs fine so far. Steffen On Friday 21/02/2020 at 11:14, Yann Ylavic wrote: Hi Steffen, On Fri, Feb 21, 2020 at 10:23 AM Steffen wrote: Building revision 1874291 failed in Windows. mod_ssl.c(27,10): fatal error C1083: Cannot open include file: 'ap_config_auto.h': No such file or directory Better if you #include "ap_config.h" instead? Regards, Yann.
Re: Branches 2.4.12-dev fails mod_ssl
Hi Steffen, On Fri, Feb 21, 2020 at 10:23 AM Steffen wrote: > > Building revision 1874291 failed in Windows. > > mod_ssl.c(27,10): fatal error C1083: Cannot open include file: > 'ap_config_auto.h': No such file or directory Better if you #include "ap_config.h" instead? Regards, Yann.
Re: Branches 2.4.12-dev fails mod_ssl
Typo in the subject must be: branches 2.4.x (2.4.42-dev) On Friday 21/02/2020 at 10:23, Steffen wrote: Building revision 1874291 failed in Windows. mod_ssl.c(27,10): fatal error C1083: Cannot open include file: 'ap_config_auto.h': No such file or directory Steffen
Re: svn commit: r1874132 - in /httpd/httpd/trunk: ./ modules/md/
Hi Stefan,
it seems that this commit reverts some of the spellcheck fixes from
Mike, see below hunks.
Both this commit (w/o the revert) and the typos have been backported
to 2.4.x, so "restore" needed in trunk only.
Cheers,
Yann.
> --- httpd/httpd/trunk/modules/md/md_acme_order.c (original)
> +++ httpd/httpd/trunk/modules/md/md_acme_order.c Mon Feb 17 14:05:03 2020
> @@ -513,7 +513,7 @@ static apr_status_t check_challenges(voi
> rv = APR_EINVAL;
> if (!authz->error_type) {
> md_result_printf(ctx->result, rv,
> - "domain authorization for %s
> failed, CA considers "
> + "domain authorization for %s
> failed, CA consideres "
> --- httpd/httpd/trunk/modules/md/md_acmev1_drive.c (original)
> +++ httpd/httpd/trunk/modules/md/md_acmev1_drive.c Mon Feb 17 14:05:03 2020
> @@ -49,7 +49,7 @@
> * Pre-Req: we have an account for the ACME server that has accepted the
> current license agreement
> * For each domain in MD:
> * - check if there already is a valid AUTHZ resource
> - * - if not, create an AUTHZ resource with challenge data
> + * - if ot, create an AUTHZ resource with challenge data
> --- httpd/httpd/trunk/modules/md/md_crypt.h (original)
> +++ httpd/httpd/trunk/modules/md/md_crypt.h Mon Feb 17 14:05:03 2020
> @@ -100,7 +100,7 @@ typedef enum {
> } md_cert_state_t;
>
> /**
> - * Create a holder of the certificate that will free its memory when the
> + * Create a holder of the certificate that will free its memmory when the
> --- httpd/httpd/trunk/modules/md/md_http.h (original)
> +++ httpd/httpd/trunk/modules/md/md_http.h Mon Feb 17 14:05:03 2020
> @@ -86,7 +86,7 @@ apr_status_t md_http_create(md_http_t **
> void md_http_set_response_limit(md_http_t *http, apr_off_t resp_limit);
>
> /**
> - * Set the timeout for the complete request. This needs to take everything
> from
> + * Set the timeout for the complete reqest. This needs to take everything
> from
> @@ -134,7 +134,7 @@ void md_http_set_on_status_cb(md_http_re> void
> md_http_set_on_response_cb(md_http_request_t *req, md_http_response_cb *cb,
> void *baton);
>
> /**
> - * Create a GET request.
> + * Create a GET reqest.
> @@ -144,7 +144,7 @@ apr_status_t md_http_GET_create(md_http_>
> struct apr_table_t *headers);
>
> /**
> - * Create a HEAD request.
> + * Create a HEAD reqest.
> @@ -154,7 +154,7 @@ apr_status_t md_http_HEAD_create(md_http>
> struct apr_table_t *headers);
>
> /**
> - * Create a POST request with a bucket brigade as request body.
> + * Create a POST reqest with a bucket brigade as request body.
> @@ -168,7 +168,7 @@ apr_status_t md_http_POST_create(md_http>
> struct apr_bucket_brigade *body, int detect_len);
>
> /**
> - * Create a POST request with known request body data.
> + * Create a POST reqest with known request body data.
> @@ -213,7 +213,7 @@ typedef apr_status_t md_http_next_req(md> * To limit
> the number of parallel requests, nextreq should return APR_ENOENT when the
> limit
> * is reached. It will be called again when the number of in_flight requests
> changes.
> *
> - * When all requests are done, nextreq will be called one more time. Should
> it not
> + * When all reqests are done, nextreq will be called one more time. Should
> it not
> --- httpd/httpd/trunk/modules/md/md_reg.c (original)> +++
> httpd/httpd/trunk/modules/md/md_reg.c Mon Feb 17 14:05:03 2020
> @@ -670,7 +670,7 @@ int md_reg_should_warn(md_reg_t *reg, co
> }
>
>
> /**/
> -/* syncing */
> +/* synching */
> @@ -836,7 +836,7 @@ leave:
> }
>
> /**
> - * Finish syncing an MD with the store.
> + * Finish synching an MD with the store.
> --- httpd/httpd/trunk/modules/md/md_reg.h (original)
> +++ httpd/httpd/trunk/modules/md/md_reg.h Mon Feb 17 14:05:03 2020
> @@ -145,7 +145,7 @@ apr_status_t md_reg_delete_acct(md_reg_t
> * Cleanup any challenges that are no longer in use.
> *
> * @param reg the registry
> - * @param p pool for permanent storage
> + * @param p pool for permament storage
> @@ -160,7 +160,7 @@ apr_status_t md_reg_cleanup_challenges(m
> apr_status_t md_reg_freeze_domains(md_reg_t *reg, apr_array_header_t *mds);
>
> /**
> - * Return if the certificate of the MD should be renewed. This includes
> reaching
> + * Return if the certificate of the MD shoud be renewed. This includes
> reaching
> @@ -222,7 +222,7 @@ struct md_proto_t {
> };
>
> /**
> - * Run a test initialization of the renew protocol for the given MD. This
> verifies
> + * Run a test intialization of the renew protocol for the given MD. This
> verifies
> --- httpd/httpd/trunk/modules/md/md_status.h (original)
> +++ httpd/httpd/trunk/modules/md/md_status.h Mon Feb 17 14:05:03
Branches 2.4.12-dev fails mod_ssl
Building revision 1874291 failed in Windows. mod_ssl.c(27,10): fatal error C1083: Cannot open include file: 'ap_config_auto.h': No such file or directory Steffen
