You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2014/07/19 11:46:20 UTC
svn commit: r1611871 - in /httpd/httpd/trunk:
modules/arch/netware/mod_nw_ssl.c modules/ssl/ssl_engine_vars.c
server/util_expr_eval.c
Author: jailletc36
Date: Sat Jul 19 09:46:20 2014
New Revision: 1611871
URL: http://svn.apache.org/r1611871
Log:
Do not use deprecated define.
No change in generated code because MODULE_MAGIC_NUMBER is defined as:
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR
Modified:
httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c
httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
httpd/httpd/trunk/server/util_expr_eval.c
Modified: httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c?rev=1611871&r1=1611870&r2=1611871&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c (original)
+++ httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c Sat Jul 19 09:46:20 2014
@@ -1086,7 +1086,7 @@ char *ssl_var_lookup(apr_pool_t *p, serv
else if (strcEQ(var, "SERVER_SOFTWARE"))
result = ap_get_server_banner();
else if (strcEQ(var, "API_VERSION")) {
- result = apr_itoa(p, MODULE_MAGIC_NUMBER);
+ result = apr_itoa(p, MODULE_MAGIC_NUMBER_MAJOR);
resdup = FALSE;
}
else if (strcEQ(var, "TIME_YEAR")) {
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c?rev=1611871&r1=1611870&r2=1611871&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c Sat Jul 19 09:46:20 2014
@@ -261,7 +261,7 @@ char *ssl_var_lookup(apr_pool_t *p, serv
else if (strcEQ(var, "SERVER_SOFTWARE"))
result = ap_get_server_banner();
else if (strcEQ(var, "API_VERSION")) {
- result = apr_itoa(p, MODULE_MAGIC_NUMBER);
+ result = apr_itoa(p, MODULE_MAGIC_NUMBER_MAJOR);
resdup = FALSE;
}
else if (strcEQ(var, "TIME_YEAR")) {
Modified: httpd/httpd/trunk/server/util_expr_eval.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr_eval.c?rev=1611871&r1=1611870&r2=1611871&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_eval.c (original)
+++ httpd/httpd/trunk/server/util_expr_eval.c Sat Jul 19 09:46:20 2014
@@ -1512,7 +1512,7 @@ static const char *misc_var_fn(ap_expr_e
case 8:
return ap_get_server_banner();
case 9:
- return apr_itoa(ctx->p, MODULE_MAGIC_NUMBER);
+ return apr_itoa(ctx->p, MODULE_MAGIC_NUMBER_MAJOR);
default:
ap_assert(0);
}