Commit 80c930c8 authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

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
parent bbffc5c0

modules/proxy/mod_proxy_fcgi.c

+5 −10
Original line number Diff line number Diff line
@@ -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;

    }
@@ -1042,7 +1036,7 @@ static const char *cmd_servertype(cmd_parms *cmd, void *in_dconf, 
    }

    else { 

        return "ProxyFCGIBackendType requires one of the following arguments: "

               "'GENERIC', 'PHP-FPM'";

               "'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'"),

                  "Specify the type of FastCGI server: 'Generic', 'FPM'"),

    { NULL }

};