From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 13 Jan 2017 07:22:29 +0000 (+0000)
Subject: Follow-up to r1778350
X-Git-Tag: 2.5.0-alpha~789
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78d43511372349058e763692339260e71a7577d8;p=thirdparty%2Fapache%2Fhttpd.git

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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778500 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index b291dae3411..6f7bda00954 100644
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -1023,17 +1023,11 @@ static void *fcgi_merge_dconf(apr_pool_t *p, void *basev, void *overridesv)
     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_parms *cmd, void *in_dconf,
        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 }
 };