Re: Trunk errors
I open a new thread, the build errors reported here are solved. Steffen On Sunday 10/05/2020 at 15:41, Steffen wrote: Running trunk : cannot start. First with generated httpd conf: [ssl:warn] [pid 1836:tid 636] AH10235: SSLRandomSeed is deprecated and has no effect with OpenSSL 1.1.1 and later [ssl:warn] [pid 1836:tid 636] AH10235: SSLRandomSeed is deprecated and has no effect with OpenSSL 1.1.1 and later Then I commented out : #SSLRandomSeed startup builtin #SSLRandomSeed connect builtin Then it did not start: [core:error] [pid 2796:tid 864] (70023)This function has not been implemented on this platform: AH10231: httpd: Failed creating pid file C:/Apache2x/logs/httpd.pid.EnERCx Here more work to be done after this VS16 Win64 is tested : VS16 Win64, VC15 Win32/Win64, VC14 Win32/64 and re-build all the third-party modules. And test Win7/10 - Server 2016/2019 Left building issues, with comments from Gregg: Tried revision 1877505. libhttpd : miss in trunk modules\http\http_etag.c. Moved the one from Branches to include, libhttpd builds then, is that ok ? Gregg: Yes to get it to build for now. Question is why isn't it in trunk, modules/http like it is in branches or anywhere (quick look and I can't see it). mod_cache : #include "test_char.h" not found. Copied the generated server/test_char.h to /include, mod_cache builds then, is that ok ? Gregg: Yes to get it to build for now. We may just need to change the location it's generated to, or just point to it's location in the build. If it's not a public header then we do the second option. I'll look at that. Steffen On Sunday 10/05/2020 at 14:36, Yann Ylavic wrote: On Sun, May 10, 2020 at 2:28 PM Steffen wrote: Builds now, Thanks! Thanks for testing, committed in r1877548.
Re: Trunk errors
Running trunk : cannot start. First with generated httpd conf: [ssl:warn] [pid 1836:tid 636] AH10235: SSLRandomSeed is deprecated and has no effect with OpenSSL 1.1.1 and later [ssl:warn] [pid 1836:tid 636] AH10235: SSLRandomSeed is deprecated and has no effect with OpenSSL 1.1.1 and later Then I commented out : #SSLRandomSeed startup builtin #SSLRandomSeed connect builtin Then it did not start: [core:error] [pid 2796:tid 864] (70023)This function has not been implemented on this platform: AH10231: httpd: Failed creating pid file C:/Apache2x/logs/httpd.pid.EnERCx Here more work to be done after this VS16 Win64 is tested : VS16 Win64, VC15 Win32/Win64, VC14 Win32/64 and re-build all the third-party modules. And test Win7/10 - Server 2016/2019 Left building issues, with comments from Gregg: Tried revision 1877505. libhttpd : miss in trunk modules\http\http_etag.c. Moved the one from Branches to include, libhttpd builds then, is that ok ? Gregg: Yes to get it to build for now. Question is why isn't it in trunk, modules/http like it is in branches or anywhere (quick look and I can't see it). mod_cache : #include "test_char.h" not found. Copied the generated server/test_char.h to /include, mod_cache builds then, is that ok ? Gregg: Yes to get it to build for now. We may just need to change the location it's generated to, or just point to it's location in the build. If it's not a public header then we do the second option. I'll look at that. Steffen On Sunday 10/05/2020 at 14:36, Yann Ylavic wrote: On Sun, May 10, 2020 at 2:28 PM Steffen wrote: Builds now, Thanks! Thanks for testing, committed in r1877548.
Re: Trunk errors
On Sun, May 10, 2020 at 2:28 PM Steffen wrote: > > Builds now, Thanks! Thanks for testing, committed in r1877548.
Re: Trunk errors
Builds now, Thanks! On Sunday 10/05/2020 at 14:17, Yann Ylavic wrote: On Sun, May 10, 2020 at 1:30 PM Steffen wrote: Errors, what I did: copied server/core.h to /include You don't need this, my patch missed removing #include "core.h" from "modules/ssl/ssl_engine_io.c", just do that. Cheers, Yann.
Re: Trunk errors
On Sun, May 10, 2020 at 2:16 PM Yann Ylavic wrote:
>
> On Sun, May 10, 2020 at 1:30 PM Steffen wrote:
> >
> > Errors,
> >
> > what I did: copied server/core.h to /include
>
> You don't need this, my patch missed removing #include "core.h" from
> "modules/ssl/ssl_engine_io.c", just do that.
And probably from "server/util_filter.c" too, full patched attached.
>
> Cheers,
> Yann.
Index: include/ap_mmn.h
===
--- include/ap_mmn.h (revision 1876933)
+++ include/ap_mmn.h (working copy)
@@ -629,6 +629,7 @@
* 20200331.3 (2.5.1-dev) Add ap_parse_request_line() and
* ap_check_request_header()
* 20200420.0 (2.5.1-dev) Add flags to listen_rec in place of use_specific_errors
+ * 20200420.1 (2.5.1-dev) Add ap_filter_adopt_brigade()
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -636,7 +637,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20200420
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 0/* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1/* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
Index: include/util_filter.h
===
--- include/util_filter.h (revision 1876933)
+++ include/util_filter.h (working copy)
@@ -621,6 +621,17 @@ AP_DECLARE(apr_status_t) ap_filter_reinstate_briga
apr_bucket **flush_upto);
/**
+ * Adopt a bucket brigade as is (no setaside nor copy).
+ * @param f The current filter
+ * @param bb The bucket brigade adopted. This brigade is always empty
+ * on return
+ * @remark All buckets in bb should be allocated on f->c->pool and
+ * f->c->bucket_alloc.
+ */
+AP_DECLARE(void) ap_filter_adopt_brigade(ap_filter_t *f,
+ apr_bucket_brigade *bb);
+
+/**
* This function calculates whether there are any as yet unsent
* buffered brigades in downstream filters, and returns non zero
* if so.
Index: modules/ssl/ssl_engine_io.c
===
--- modules/ssl/ssl_engine_io.c (revision 1876934)
+++ modules/ssl/ssl_engine_io.c (working copy)
@@ -30,7 +30,6 @@
#include "ssl_private.h"
#include "mod_ssl.h"
#include "mod_ssl_openssl.h"
-#include "core.h"
#include "apr_date.h"
APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ssl, SSL, int, proxy_post_handshake,
Index: server/core.h
===
--- server/core.h (revision 1876933)
+++ server/core.h (working copy)
@@ -33,16 +33,6 @@ typedef struct conn_config_t {
apr_socket_t *socket;
} conn_config_t;
-/**
- * Adopt a bucket brigade as is (no setaside nor copy).
- * @param f The current filter
- * @param bb The bucket brigade adopted. This brigade is always empty
- * on return
- * @remark All buckets in bb should be allocated on f->c->pool and
- * f->c->bucket_alloc.
- */
-void ap_filter_adopt_brigade(ap_filter_t *f, apr_bucket_brigade *bb);
-
#endif /* CORE_H */
/** @} */
Index: server/util_filter.c
===
--- server/util_filter.c (revision 1877077)
+++ server/util_filter.c (working copy)
@@ -26,7 +26,6 @@
#include "http_log.h"
#include "http_request.h"
#include "util_filter.h"
-#include "core.h"
/* NOTE: Apache's current design doesn't allow a pool to be passed thru,
so we depend on a global to hold the correct pool
@@ -1036,7 +1035,8 @@ AP_DECLARE(apr_status_t) ap_filter_setaside_brigad
return rv;
}
-void ap_filter_adopt_brigade(ap_filter_t *f, apr_bucket_brigade *bb)
+AP_DECLARE(void) ap_filter_adopt_brigade(ap_filter_t *f,
+ apr_bucket_brigade *bb)
{
struct ap_filter_private *fp = f->priv;
Re: Trunk errors
On Sun, May 10, 2020 at 1:30 PM Steffen wrote: > > Errors, > > what I did: copied server/core.h to /include You don't need this, my patch missed removing #include "core.h" from "modules/ssl/ssl_engine_io.c", just do that. Cheers, Yann.
Re: Trunk errors
Errors, what I did: copied server/core.h to /include Get: C:\VC16\Win32\httpd-trunk\include\core.h(44,6): error C2373: 'ap_filter_adopt_brigade': redefinition; different type modifiers C:\VC16\Win32\httpd-trunk\include\util_filter.h(631): message : see declaration of 'ap_filter_adopt_brigade' On Sunday 10/05/2020 at 12:10, Yann Ylavic wrote: On Sat, May 9, 2020 at 5:30 PM Steffen wrote: Patch gives errors, but was given me the direction, Thanks! htdbm and htpasswd got it running !! by adding in support/passwd_common.h : #if !defined(WIN32) && !defined(NETWARE) #include "ap_config_auto.h" #endif Your patch not used it is giving other errors, for example ab is not building, get ab.obj : error LNK2001: unresolved external symbol __imp__ap_real_exit_code OK, fair enough. mod_ssl : ssl\ssl_engine_io.c(33,10): fatal error C1083: Cannot open include file: 'core.h' When I copy server/core.h to mod_ssl dir, then error: ssl_engine_io.obj : error LNK2019: unresolved external symbol _ap_filter_adopt_brigade referenced in function _char_buffer_insert So on Windows ap_filter_adopt_brigade() needs to be exported to be used by modules, oh well. How about the attached patch then? Regards, Yann.
Re: Trunk errors
On Sat, May 9, 2020 at 5:30 PM Steffen wrote:
>
> Patch gives errors, but was given me the direction, Thanks!
>
> htdbm and htpasswd got it running !!
>
>
> by adding in support/passwd_common.h :
>
> #if !defined(WIN32) && !defined(NETWARE)
> #include "ap_config_auto.h"
> #endif
>
> Your patch not used it is giving other errors, for example ab is not
> building, get
> ab.obj : error LNK2001: unresolved external symbol __imp__ap_real_exit_code
OK, fair enough.
>
> mod_ssl :
> ssl\ssl_engine_io.c(33,10): fatal error C1083: Cannot open include file:
> 'core.h'
> When I copy server/core.h to mod_ssl dir, then error: ssl_engine_io.obj :
> error LNK2019: unresolved external symbol _ap_filter_adopt_brigade referenced
> in function _char_buffer_insert
So on Windows ap_filter_adopt_brigade() needs to be exported to be
used by modules, oh well.
How about the attached patch then?
Regards,
Yann.
Index: include/ap_mmn.h
===
--- include/ap_mmn.h (revision 1876933)
+++ include/ap_mmn.h (working copy)
@@ -629,6 +629,7 @@
* 20200331.3 (2.5.1-dev) Add ap_parse_request_line() and
* ap_check_request_header()
* 20200420.0 (2.5.1-dev) Add flags to listen_rec in place of use_specific_errors
+ * 20200420.1 (2.5.1-dev) Add ap_filter_adopt_brigade()
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -636,7 +637,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20200420
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 0/* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1/* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
Index: include/util_filter.h
===
--- include/util_filter.h (revision 1876933)
+++ include/util_filter.h (working copy)
@@ -621,6 +621,17 @@ AP_DECLARE(apr_status_t) ap_filter_reinstate_briga
apr_bucket **flush_upto);
/**
+ * Adopt a bucket brigade as is (no setaside nor copy).
+ * @param f The current filter
+ * @param bb The bucket brigade adopted. This brigade is always empty
+ * on return
+ * @remark All buckets in bb should be allocated on f->c->pool and
+ * f->c->bucket_alloc.
+ */
+AP_DECLARE(void) ap_filter_adopt_brigade(ap_filter_t *f,
+ apr_bucket_brigade *bb);
+
+/**
* This function calculates whether there are any as yet unsent
* buffered brigades in downstream filters, and returns non zero
* if so.
Index: server/core.h
===
--- server/core.h (revision 1876933)
+++ server/core.h (working copy)
@@ -33,16 +33,6 @@ typedef struct conn_config_t {
apr_socket_t *socket;
} conn_config_t;
-/**
- * Adopt a bucket brigade as is (no setaside nor copy).
- * @param f The current filter
- * @param bb The bucket brigade adopted. This brigade is always empty
- * on return
- * @remark All buckets in bb should be allocated on f->c->pool and
- * f->c->bucket_alloc.
- */
-void ap_filter_adopt_brigade(ap_filter_t *f, apr_bucket_brigade *bb);
-
#endif /* CORE_H */
/** @} */
Index: server/util_filter.c
===
--- server/util_filter.c (revision 1877077)
+++ server/util_filter.c (working copy)
@@ -1036,7 +1036,8 @@ AP_DECLARE(apr_status_t) ap_filter_setaside_brigad
return rv;
}
-void ap_filter_adopt_brigade(ap_filter_t *f, apr_bucket_brigade *bb)
+AP_DECLARE(void) ap_filter_adopt_brigade(ap_filter_t *f,
+ apr_bucket_brigade *bb)
{
struct ap_filter_private *fp = f->priv;
Re: Trunk errors
Patch gives errors, but was given me the direction, Thanks! htdbm and htpasswd got it running !! by adding in support/passwd_common.h : #if !defined(WIN32) && !defined(NETWARE) #include "ap_config_auto.h" #endif Your patch not used it is giving other errors, for example ab is not building, get ab.obj : error LNK2001: unresolved external symbol __imp__ap_real_exit_code So left issues : mod_ssl : ssl\ssl_engine_io.c(33,10): fatal error C1083: Cannot open include file: 'core.h' When I copy server/core.h to mod_ssl dir, then error: ssl_engine_io.obj : error LNK2019: unresolved external symbol _ap_filter_adopt_brigade referenced in function _char_buffer_insert Tried also link with libhttpd.lib, no go. And the ones with Greggs answer. Tried revision 1877505. libhttpd : miss in trunk modules\http\http_etag.c. Moved the one from Branches to include, libhttpd builds then, is that ok ? Gregg: Yes to get it to build for now. Question is why isn't it in trunk, modules/http like it is in branches or anywhere (quick look and I can't see it). mod_cache : #include "test_char.h" not found. Copied the generated server/test_char.h to /include, mod_cache builds then, is that ok ? Gregg: Yes to get it to build for now. We may just need to change the location it's generated to, or just point to it's location in the build. If it's not a public header then we do the second option. I'll look at that. Steffen, trying to be a human Travis :) On Saturday 09/05/2020 at 14:59, Yann Ylavic wrote: On Sat, May 9, 2020 at 1:10 AM Gregg Smith wrote: htdbm and htpasswd : support\passwd_common.h(31,10): fatal error C1083: Cannot open include file: 'ap_config_auto.h': No such file or directory. This gives me a deja vu feeling with what stopped mod_ssl from building in 2.4.42. The winbuilds dsp/mak files generate headers by copying a .h.in file of the same name like ap_config_layout.h.in. This deja vu feeling tells me just feeding it an empty ap_config_auto.h will not do. It might build at least and seem to work but wouldn't be correct. Yann? :) I think we should not #include ap_config_auto.h directly, but ap_config.h instead (which has the necessary #ifnot WINW32..). So how about the attached patch? Regards, Yann.
Re: Trunk errors
On Sat, May 9, 2020 at 1:10 AM Gregg Smith wrote: > > > htdbm and htpasswd : > > support\passwd_common.h(31,10): fatal error C1083: Cannot open include > > file: 'ap_config_auto.h': No such file or directory. > > > This gives me a deja vu feeling with what stopped mod_ssl from building > in 2.4.42. The winbuilds dsp/mak files generate headers by copying a > .h.in file of the same name like ap_config_layout.h.in. This deja vu > feeling tells me just feeding it an empty ap_config_auto.h will not do. > It might build at least and seem to work but wouldn't be correct. > Yann? :) I think we should not #include ap_config_auto.h directly, but ap_config.h instead (which has the necessary #ifnot WINW32..). So how about the attached patch? Regards, Yann. Index: modules/dav/fs/mod_dav_fs.c === --- modules/dav/fs/mod_dav_fs.c (revision 1876933) +++ modules/dav/fs/mod_dav_fs.c (working copy) @@ -17,9 +17,7 @@ #include "httpd.h" #include "http_config.h" #include "apr_strings.h" -#if !defined(_MSC_VER) && !defined(NETWARE) -#include "ap_config_auto.h" -#endif +#include "ap_config.h" #include "mod_dav.h" #include "repos.h" Index: modules/proxy/mod_serf.h === --- modules/proxy/mod_serf.h (revision 1876933) +++ modules/proxy/mod_serf.h (working copy) @@ -23,9 +23,7 @@ #include "httpd.h" #include "http_config.h" -#if !defined(WIN32) && !defined(NETWARE) -#include "ap_config_auto.h" -#endif +#include "ap_config.h" #ifdef HAVE_SERF #include "serf.h" #endif Index: support/ab.c === --- support/ab.c (revision 1876933) +++ support/ab.c (working copy) @@ -153,9 +153,7 @@ #include /* for getpid() */ #endif -#if !defined(WIN32) && !defined(NETWARE) -#include "ap_config_auto.h" -#endif +#include "ap_config.h" #if defined(HAVE_OPENSSL) Index: support/passwd_common.h === --- support/passwd_common.h (revision 1876933) +++ support/passwd_common.h (working copy) @@ -28,7 +28,7 @@ #include "apu_version.h" #endif -#include "ap_config_auto.h" +#include "ap_config.h" #define MAX_STRING_LEN 256
Re: Trunk errors
Forget mod_ssl error below for now. The first error is: ssl\ssl_engine_io.c(33,10): fatal error C1083: Cannot open include file: 'core.h' When I copy core.h to mod_ssl dir, then I get below error. Tried also link with libhttpd.lib, no go. So first solve the core.h error. On Saturday 09/05/2020 at 01:10, Gregg Smith wrote: Hi Steffen, Assuming your building in the IDE as I know to be your usual; On 5/8/2020 4:59 AM, Steffen wrote: Tried revision 1877505. libhttpd : miss in trunk modules\http\http_etag.c. Moved the one from Branches to include, libhttpd builds then, is that ok ? Yes to get it to build for now. Question is why isn't it in trunk, modules/http like it is in branches or anywhere (quick look and I can't see it). mod_cache : #include "test_char.h" not found. Copied the generated server/test_char.h to /include, mod_cache builds then, is that ok ? Yes to get it to build for now. We may just need to change the location it's generated to, or just point to it's location in the build. If it's not a public header then we do the second option. I'll look at that. htdbm and htpasswd : support\passwd_common.h(31,10): fatal error C1083: Cannot open include file: 'ap_config_auto.h': No such file or directory. This gives me a deja vu feeling with what stopped mod_ssl from building in 2.4.42. The winbuilds dsp/mak files generate headers by copying a .h.in file of the same name like ap_config_layout.h.in. This deja vu feeling tells me just feeding it an empty ap_config_auto.h will not do. It might build at least and seem to work but wouldn't be correct. Yann? :) mod_ssl : ssl_engine_io.obj : error LNK2019: unresolved external symbol _ap_filter_adopt_brigade referenced in function _char_buffer_insert AFAIK all ap_* functions are in libhttpd, maybe we're not compiling/linking a new file. It looks to be in util_filters.c and that shows as being compiled/linked to libhttpd. ???Huh??? Looks like all the errors are related to changes in/after 2018. In 2018 I build it without errors. Did not build all yet and only Win32 VS16, so maybe more to come. Let's get it building on one version first, worry about any nuances in the various VC versions second. Gregg
Re: Trunk errors
Hi Steffen, Assuming your building in the IDE as I know to be your usual; On 5/8/2020 4:59 AM, Steffen wrote: Tried revision 1877505. libhttpd : miss in trunk modules\http\http_etag.c. Moved the one from Branches to include, libhttpd builds then, is that ok ? Yes to get it to build for now. Question is why isn't it in trunk, modules/http like it is in branches or anywhere (quick look and I can't see it). mod_cache : #include "test_char.h" not found. Copied the generated server/test_char.h to /include, mod_cache builds then, is that ok ? Yes to get it to build for now. We may just need to change the location it's generated to, or just point to it's location in the build. If it's not a public header then we do the second option. I'll look at that. htdbm and htpasswd : support\passwd_common.h(31,10): fatal error C1083: Cannot open include file: 'ap_config_auto.h': No such file or directory. This gives me a deja vu feeling with what stopped mod_ssl from building in 2.4.42. The winbuilds dsp/mak files generate headers by copying a .h.in file of the same name like ap_config_layout.h.in. This deja vu feeling tells me just feeding it an empty ap_config_auto.h will not do. It might build at least and seem to work but wouldn't be correct. Yann? :) mod_ssl : ssl_engine_io.obj : error LNK2019: unresolved external symbol _ap_filter_adopt_brigade referenced in function _char_buffer_insert AFAIK all ap_* functions are in libhttpd, maybe we're not compiling/linking a new file. It looks to be in util_filters.c and that shows as being compiled/linked to libhttpd. ???Huh??? Looks like all the errors are related to changes in/after 2018. In 2018 I build it without errors. Did not build all yet and only Win32 VS16, so maybe more to come. Let's get it building on one version first, worry about any nuances in the various VC versions second. Gregg
Re: Trunk errors for proxy
Nevermind... local build issue. On Sep 11, 2014, at 2:01 PM, Jim Jagielski j...@jagunet.com wrote: Anyone else seeing the test framework erroring out on mod_proxy* tests on trunk? t/modules/proxy.t ... 7/17 # Failed test 16 in t/modules/proxy.t at line 74 # Failed test 17 in t/modules/proxy.t at line 75 t/modules/proxy.t ... Failed 2/17 subtests t/modules/proxy_balancer.t .. 1/1 # Failed test 1 in t/modules/proxy_balancer.t at line 16 t/modules/proxy_balancer.t .. Failed 1/1 subtests # testing : reverse proxy of redirect via balancer # expected: 301 # received: '503' not ok 16 # testing : reverse proxy via balancer rewrote redirect # expected: 'http://localhost:8546/pr45434/5.html' # received: undef not ok 17 # Failed test 16 in t/modules/proxy.t at line 74 # Failed test 17 in t/modules/proxy.t at line 75
