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 2017/01/13 07:22:30 UTC
svn commit: r1778500 - /httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
Author: jailletc36
Date: Fri Jan 13 07:22:29 2017
New Revision: 1778500
URL: http://svn.apache.org/viewvc?rev=1778500&view=rev
Log:
Follow-up to r1778350
Remove useless tests in order to avoid the duplication of a message.
Be consistent with "FPM" vs "PHP-FPM" usage messages.
Fix style issues.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c?rev=1778500&r1=1778499&r2=1778500&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c Fri Jan 13 07:22:29 2017
@@ -1023,17 +1023,11 @@ static void *fcgi_merge_dconf(apr_pool_t
return a;
}
-
static const char *cmd_servertype(cmd_parms *cmd, void *in_dconf,
const char *val)
{
fcgi_dirconf_t *dconf = in_dconf;
- if (!val || !*val) {
- return "ProxyFCGIBackendType requires one of the following arguments: "
- "'GENERIC', 'PHP-FPM'";
- }
-
if (!strcasecmp(val, "GENERIC")) {
dconf->backend_type = BACKEND_GENERIC;
}
@@ -1041,8 +1035,8 @@ static const char *cmd_servertype(cmd_pa
dconf->backend_type = BACKEND_FPM;
}
else {
- return "ProxyFCGIBackendType requires one of the following arguments: "
- "'GENERIC', 'PHP-FPM'";
+ return "ProxyFCGIBackendType requires one of the following arguments: "
+ "'GENERIC', 'FPM'";
}
return NULL;
@@ -1053,9 +1047,10 @@ static void register_hooks(apr_pool_t *p
proxy_hook_scheme_handler(proxy_fcgi_handler, NULL, NULL, APR_HOOK_FIRST);
proxy_hook_canon_handler(proxy_fcgi_canon, NULL, NULL, APR_HOOK_FIRST);
}
+
static const command_rec command_table[] = {
- AP_INIT_TAKE1( "ProxyFCGIBackendType", cmd_servertype, NULL, OR_FILEINFO,
- " Specify the type of FastCGI server: 'Generic' 'FPM'"),
+ AP_INIT_TAKE1("ProxyFCGIBackendType", cmd_servertype, NULL, OR_FILEINFO,
+ "Specify the type of FastCGI server: 'Generic', 'FPM'"),
{ NULL }
};