detabify

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

diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index 24acfc5f06acf584919918f57102f7f52ebd1962..406928dd3b46ac2dc5c19f68b78fbb4e69618501 100644 (file)
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -417,13 +417,13 @@ start_over:
 #ifdef LDAP_SECURITY_ERROR
                  : (LDAP_SECURITY_ERROR(result)) ? AUTH_DENIED
 #else
-                                : (LDAP_INAPPROPRIATE_AUTH == result) ? AUTH_DENIED
-                                : (LDAP_INVALID_CREDENTIALS == result) ? AUTH_DENIED
+                 : (LDAP_INAPPROPRIATE_AUTH == result) ? AUTH_DENIED
+                 : (LDAP_INVALID_CREDENTIALS == result) ? AUTH_DENIED
 #ifdef LDAP_INSUFFICIENT_ACCESS
                  : (LDAP_INSUFFICIENT_ACCESS == result) ? AUTH_DENIED
 #endif
 #ifdef LDAP_INSUFFICIENT_RIGHTS
-                                : (LDAP_INSUFFICIENT_RIGHTS == result) ? AUTH_DENIED
+                 : (LDAP_INSUFFICIENT_RIGHTS == result) ? AUTH_DENIED
 #endif
 #endif
                  : AUTH_GENERAL_ERROR;

diff --git a/modules/aaa/mod_authz_host.c b/modules/aaa/mod_authz_host.c
index d4e0b5b9f731a8d2a54b18677ef94fa1f4b6adb0..77af8965686a86aed0b8a1dbc5bf9952451b37b4 100644 (file)
--- a/modules/aaa/mod_authz_host.c
+++ b/modules/aaa/mod_authz_host.c
@@ -45,7 +45,7 @@
 #endif
 
 typedef struct {
-       int dummy;  /* just here to stop compiler warnings for now. */
+        int dummy;  /* just here to stop compiler warnings for now. */
 } authz_host_dir_conf;
 
 module AP_MODULE_DECLARE_DATA authz_host_module;

diff --git a/modules/aaa/mod_authz_user.c b/modules/aaa/mod_authz_user.c
index 0253360cb22568817c7be923b5ff563d1e135378..8607a033d18d526bce152d6c81fd1575ce7432b3 100644 (file)
--- a/modules/aaa/mod_authz_user.c
+++ b/modules/aaa/mod_authz_user.c
@@ -28,7 +28,7 @@
 #include "mod_auth.h"
 
 typedef struct {
-       int dummy;  /* just here to stop compiler warnings for now. */
+        int dummy;  /* just here to stop compiler warnings for now. */
 } authz_user_config_rec;
 
 static void *create_authz_user_dir_config(apr_pool_t *p, char *d)

diff --git a/server/util_script.c b/server/util_script.c
index 3822b9b894447c106213c5b9fb20e1e015d5b7aa..c6c381e051f9a5e6ebf4c7da6b85d5bded8bf5d3 100644 (file)
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -468,17 +468,17 @@ AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
         if (w[0] == '\0') {
             int cond_status = OK;
 
-           /* PR#38070: This fails because it gets confused when a
-            * CGI Status header overrides ap_meets_conditions.
-            * 
-            * We can fix that by dropping ap_meets_conditions when
-            * Status has been set.  Since this is the only place
-            * cgi_status gets used, let's test it explicitly.
-            *
-            * The alternative would be to ignore CGI Status when
-            * ap_meets_conditions returns anything interesting.
-            * That would be safer wrt HTTP, but would break CGI.
-            */
+            /* PR#38070: This fails because it gets confused when a
+             * CGI Status header overrides ap_meets_conditions.
+             * 
+             * We can fix that by dropping ap_meets_conditions when
+             * Status has been set.  Since this is the only place
+             * cgi_status gets used, let's test it explicitly.
+             *
+             * The alternative would be to ignore CGI Status when
+             * ap_meets_conditions returns anything interesting.
+             * That would be safer wrt HTTP, but would break CGI.
+             */
             if ((cgi_status == HTTP_UNSET) && (r->method_number == M_GET)) {
                 cond_status = ap_meets_conditions(r);
             }