Index: acinclude.m4 =================================================================== --- acinclude.m4 (revision 1701214) +++ acinclude.m4 (working copy) @@ -811,7 +811,7 @@ AC_CACHE_CHECK([whether gcc accepts $1], ap_gcc_ckvar, [ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $1" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([int foo() { return 0; }])], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ap_gcc_ckvar=yes], [ap_gcc_ckvar=no]) CFLAGS="$save_CFLAGS" ]) Index: configure.in =================================================================== --- configure.in (revision 1701214) +++ configure.in (working copy) @@ -625,11 +625,12 @@ APR_ADDTO(CPPFLAGS, -DAP_DEBUG) if test "$GCC" = "yes"; then APR_ADDTO(CFLAGS,[-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wpointer-arith]) + APACHE_ADD_GCC_CFLAG([-std=c89]) + APACHE_ADD_GCC_CFLAG([-Werror]) APACHE_ADD_GCC_CFLAG([-Wdeclaration-after-statement]) - APACHE_ADD_GCC_CFLAG([-Werror=declaration-after-statement]) APACHE_ADD_GCC_CFLAG([-Wformat]) APACHE_ADD_GCC_CFLAG([-Wformat-security]) - APACHE_ADD_GCC_CFLAG([-Werror=format-security]) + APACHE_ADD_GCC_CFLAG([-Wunused]) elif test "$AIX_XLC" = "yes"; then APR_ADDTO(CFLAGS,-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro) fi @@ -893,6 +894,13 @@ AC_MSG_NOTICE([Restore user-defined environment settings...]) AC_MSG_NOTICE([]) +APACHE_CONF_SEL_CC=${CC} +APACHE_CONF_SEL_CFLAGS=${CFLAGS} +APACHE_CONF_SEL_LDFLAGS=${LDFLAGS} +APACHE_CONF_SEL_LIBS=${LIBS} +APACHE_CONF_SEL_CPPFLAGS=${CPPFLAGS} +APACHE_CONF_SEL_CPP=${CPP} + APR_RESTORE_THE_ENVIRONMENT(CPPFLAGS, EXTRA_) APR_RESTORE_THE_ENVIRONMENT(CFLAGS, EXTRA_) APR_RESTORE_THE_ENVIRONMENT(CXXFLAGS, EXTRA_) @@ -973,3 +981,15 @@ AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-policy.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf docs/conf/extra/proxy-html.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh,[true],[ APACHE_GEN_MAKEFILES ]) + +AC_MSG_NOTICE([summary of build options: + + Server Version: ${HTTPD_VERSION} + Install prefix: ${prefix} + C compiler: ${APACHE_CONF_SEL_CC} + CFLAGS: ${APACHE_CONF_SEL_CFLAGS} + LDFLAGS: ${APACHE_CONF_SEL_LDFLAGS} + LIBS: ${APACHE_CONF_SEL_LIBS} + CPPFLAGS: ${APACHE_CONF_SEL_CPPFLAGS} + C preprocessor: ${APACHE_CONF_SEL_CPP} +]) Index: include/http_config.h =================================================================== --- include/http_config.h (revision 1701214) +++ include/http_config.h (working copy) @@ -441,6 +441,14 @@ module AP_MODULE_DECLARE_DATA foo##_module /** + * AP_DECLARE_MODULE_LAST is a convenience macro that can be used instead + * of AP_DECLARE_MODULE when it is the last thing done in a source file, + * as it avoids declaring unused static variables. + */ +#define AP_DECLARE_MODULE_LAST(foo) \ + module AP_MODULE_DECLARE_DATA foo##_module + +/** * @defgroup ModuleInit Module structure initializers * * Initializer for the first few module slots, which are only Index: include/scoreboard.h =================================================================== --- include/scoreboard.h (revision 1701214) +++ include/scoreboard.h (working copy) @@ -26,11 +26,6 @@ extern "C" { #endif -#ifdef HAVE_SYS_TIMES_H -#include -#include -#endif - #include "ap_config.h" #include "http_config.h" #include "apr_thread_proc.h" @@ -38,6 +33,11 @@ #include "apr_shm.h" #include "apr_optional.h" +#ifdef APR_HAVE_SYS_TIME_H +#include +#include +#endif + /* Scoreboard file, if there is one */ #ifndef DEFAULT_SCOREBOARD #define DEFAULT_SCOREBOARD "apache_runtime_status" /* within DEFAULT_REL_RUNTIMEDIR */ Index: modules/dav/fs/mod_dav_fs.c =================================================================== --- modules/dav/fs/mod_dav_fs.c (revision 1701214) +++ modules/dav/fs/mod_dav_fs.c (working copy) @@ -107,7 +107,7 @@ dav_fs_register(p); } -AP_DECLARE_MODULE(dav_fs) = +AP_DECLARE_MODULE_LAST(dav_fs) = { STANDARD20_MODULE_STUFF, NULL, /* dir config creater */ Index: modules/debugging/mod_bucketeer.c =================================================================== --- modules/debugging/mod_bucketeer.c (revision 1701214) +++ modules/debugging/mod_bucketeer.c (working copy) @@ -176,7 +176,7 @@ {NULL} }; -AP_DECLARE_MODULE(bucketeer) = { +AP_DECLARE_MODULE_LAST(bucketeer) = { STANDARD20_MODULE_STUFF, NULL, NULL, Index: modules/filters/mod_buffer.c =================================================================== --- modules/filters/mod_buffer.c (revision 1701214) +++ modules/filters/mod_buffer.c (working copy) @@ -337,7 +337,7 @@ AP_FTYPE_CONTENT_SET); } -AP_DECLARE_MODULE(buffer) = { +AP_DECLARE_MODULE_LAST(buffer) = { STANDARD20_MODULE_STUFF, create_buffer_config, /* create per-directory config structure */ merge_buffer_config, /* merge per-directory config structures */ Index: modules/generators/mod_info.c =================================================================== --- modules/generators/mod_info.c (revision 1701214) +++ modules/generators/mod_info.c (working copy) @@ -1006,7 +1006,7 @@ ap_hook_check_config(check_config, NULL, NULL, APR_HOOK_FIRST); } -AP_DECLARE_MODULE(info) = { +AP_DECLARE_MODULE_LAST(info) = { STANDARD20_MODULE_STUFF, NULL, /* dir config creater */ NULL, /* dir merger --- default is to override */ Index: modules/http/http_core.c =================================================================== --- modules/http/http_core.c (revision 1701214) +++ modules/http/http_core.c (working copy) @@ -317,7 +317,7 @@ ap_method_registry_init(p); } -AP_DECLARE_MODULE(http) = { +AP_DECLARE_MODULE_LAST(http) = { STANDARD20_MODULE_STUFF, NULL, /* create per-directory config structure */ NULL, /* merge per-directory config structures */ Index: modules/loggers/mod_logio.c =================================================================== --- modules/loggers/mod_logio.c (revision 1701214) +++ modules/loggers/mod_logio.c (working copy) @@ -265,7 +265,7 @@ APR_REGISTER_OPTIONAL_FN(ap_logio_get_last_bytes); } -AP_DECLARE_MODULE(logio) = +AP_DECLARE_MODULE_LAST(logio) = { STANDARD20_MODULE_STUFF, create_logio_dirconf, /* create per-dir config */ Index: modules/loggers/mod_syslog.c =================================================================== --- modules/loggers/mod_syslog.c (revision 1701214) +++ modules/loggers/mod_syslog.c (working copy) @@ -165,7 +165,7 @@ AP_ERRORLOG_PROVIDER_VERSION, &syslog_provider); } -AP_DECLARE_MODULE(syslog) = +AP_DECLARE_MODULE_LAST(syslog) = { STANDARD20_MODULE_STUFF, NULL, Index: modules/mappers/mod_dir.c =================================================================== --- modules/mappers/mod_dir.c (revision 1701214) +++ modules/mappers/mod_dir.c (working copy) @@ -410,7 +410,7 @@ ap_hook_fixups(dir_fixups,NULL,NULL,APR_HOOK_LAST); } -AP_DECLARE_MODULE(dir) = { +AP_DECLARE_MODULE_LAST(dir) = { STANDARD20_MODULE_STUFF, create_dir_config, /* create per-directory config structure */ merge_dir_configs, /* merge per-directory config structures */ Index: modules/mappers/mod_userdir.c =================================================================== --- modules/mappers/mod_userdir.c (revision 1701214) +++ modules/mappers/mod_userdir.c (working copy) @@ -379,7 +379,7 @@ #endif } -AP_DECLARE_MODULE(userdir) = { +AP_DECLARE_MODULE_LAST(userdir) = { STANDARD20_MODULE_STUFF, NULL, /* dir config creater */ NULL, /* dir merger --- default is to override */ Index: modules/mappers/mod_vhost_alias.c =================================================================== --- modules/mappers/mod_vhost_alias.c (revision 1701214) +++ modules/mappers/mod_vhost_alias.c (working copy) @@ -444,7 +444,7 @@ ap_hook_translate_name(mva_translate, aszPre, NULL, APR_HOOK_MIDDLE); } -AP_DECLARE_MODULE(vhost_alias) = +AP_DECLARE_MODULE_LAST(vhost_alias) = { STANDARD20_MODULE_STUFF, NULL, /* dir config creater */ Index: modules/metadata/mod_unique_id.c =================================================================== --- modules/metadata/mod_unique_id.c (revision 1701214) +++ modules/metadata/mod_unique_id.c (working copy) @@ -305,7 +305,7 @@ ap_hook_generate_log_id(generate_log_id, NULL, NULL, APR_HOOK_MIDDLE); } -AP_DECLARE_MODULE(unique_id) = { +AP_DECLARE_MODULE_LAST(unique_id) = { STANDARD20_MODULE_STUFF, NULL, /* dir config creater */ NULL, /* dir merger --- default is to override */ Index: modules/metadata/mod_version.c =================================================================== --- modules/metadata/mod_version.c (revision 1701214) +++ modules/metadata/mod_version.c (working copy) @@ -301,7 +301,7 @@ { NULL } }; -AP_DECLARE_MODULE(version) = +AP_DECLARE_MODULE_LAST(version) = { STANDARD20_MODULE_STUFF, NULL, /* dir config creater */ Index: modules/session/mod_session_cookie.c =================================================================== --- modules/session/mod_session_cookie.c (revision 1701214) +++ modules/session/mod_session_cookie.c (working copy) @@ -271,7 +271,7 @@ ap_hook_session_save(session_cookie_save, NULL, NULL, APR_HOOK_MIDDLE); } -AP_DECLARE_MODULE(session_cookie) = +AP_DECLARE_MODULE_LAST(session_cookie) = { STANDARD20_MODULE_STUFF, create_session_cookie_dir_config, /* dir config creater */ Index: modules/ssl/ssl_engine_kernel.c =================================================================== --- modules/ssl/ssl_engine_kernel.c (revision 1701214) +++ modules/ssl/ssl_engine_kernel.c (working copy) @@ -2184,7 +2184,7 @@ } if (inlen == 0) { - // someone tries to trick us? + /* someone tries to trick us? */ ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(02837) "ALPN client protocol list empty"); return SSL_TLSEXT_ERR_ALERT_FATAL; @@ -2194,7 +2194,7 @@ for (i = 0; i < inlen; /**/) { unsigned int plen = in[i++]; if (plen + i > inlen) { - // someone tries to trick us? + /* someone tries to trick us? */ ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(02838) "ALPN protocol identifier too long"); return SSL_TLSEXT_ERR_ALERT_FATAL; Index: server/core.c =================================================================== --- server/core.c (revision 1701214) +++ server/core.c (working copy) @@ -433,7 +433,6 @@ static void *create_core_server_config(apr_pool_t *a, server_rec *s) { core_server_config *conf; - const char **np; int is_virtual = s->is_virtual; conf = (core_server_config *)apr_pcalloc(a, sizeof(core_server_config)); @@ -5404,7 +5403,7 @@ NULL, AP_FTYPE_RESOURCE - 10); } -AP_DECLARE_MODULE(core) = { +AP_DECLARE_MODULE_LAST(core) = { MPM20_MODULE_STUFF, AP_PLATFORM_REWRITE_ARGS_HOOK, /* hook to run before apache parses args */ create_core_dir_config, /* create per-directory config structure */ Index: server/util_expr_eval.c =================================================================== --- server/util_expr_eval.c (revision 1701214) +++ server/util_expr_eval.c (working copy) @@ -98,7 +98,7 @@ case op_String: result = node->node_arg1; break; - case op_Var: + result = ap_expr_eval_var(ctx, (ap_expr_var_func_t *)node->node_arg1, node->node_arg2); break; @@ -1249,7 +1249,7 @@ apr_finfo_t sb; if (apr_stat(&sb, arg, APR_FINFO_MIN, ctx->p) == APR_SUCCESS && sb.filetype == APR_REG && sb.mtime > 0) - return apr_psprintf(ctx->p, "%" APR_OFF_T_FMT, sb.mtime); + return apr_psprintf(ctx->p, "%" APR_OFF_T_FMT, (apr_off_t)sb.mtime); else return "0"; }