diff options
| author | Christophe Jaillet <jailletc36@apache.org> | 2015-09-30 10:35:35 +0200 |
|---|---|---|
| committer | Christophe Jaillet <jailletc36@apache.org> | 2015-09-30 10:35:35 +0200 |
| commit | 68131d85a4bd75d6f727b55f7ef5d185fa5938e6 (patch) | |
| tree | 40095a56ba4ec865ae8558af9aaf0fb697bba3cc /modules/arch | |
| parent | Synch 2.4.x and trunk. (diff) | |
| download | apache2-68131d85a4bd75d6f727b55f7ef5d185fa5938e6.tar.xz apache2-68131d85a4bd75d6f727b55f7ef5d185fa5938e6.zip | |
Fix some style issues on files that can easily be synch'ed with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705983 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/arch')
| -rw-r--r-- | modules/arch/netware/mod_netware.c | 6 | ||||
| -rw-r--r-- | modules/arch/win32/mod_isapi.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/arch/netware/mod_netware.c b/modules/arch/netware/mod_netware.c index b34a5222bb..f873827eca 100644 --- a/modules/arch/netware/mod_netware.c +++ b/modules/arch/netware/mod_netware.c @@ -137,8 +137,9 @@ static apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv, } /* eliminate the '.' if there is one */ - if (*ext == '.') + if (*ext == '.') { ++ext; + } /* check if we have a registered command for the extension*/ new_cmd = apr_table_get(d->file_type_handlers, ext); @@ -154,8 +155,9 @@ static apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv, *cmd = apr_pstrcat (p, new_cmd, " ", cmd_only, NULL); /* Run in its own address space if specified */ - if(apr_table_get(d->file_handler_mode, ext)) + if (apr_table_get(d->file_handler_mode, ext)) { e_info->addrspace = 1; + } } /* Tokenize the full command string into its arguments */ diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c index ce0875a500..ec0d35e74f 100644 --- a/modules/arch/win32/mod_isapi.c +++ b/modules/arch/win32/mod_isapi.c @@ -1415,7 +1415,7 @@ static apr_status_t isapi_handler (request_rec *r) apr_uint32_t read; int res; - if(strcmp(r->handler, "isapi-isa") + if (strcmp(r->handler, "isapi-isa") && strcmp(r->handler, "isapi-handler")) { /* Hang on to the isapi-isa for compatibility with older docs * (wtf did '-isa' mean in the first place?) but introduce |