Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328...

[apache] / server / log.c

diff --git a/server/log.c b/server/log.c
index 03de91a2b2e3a0cc7a14bedd9f0eecd8cd6c1b42..b9364659a7cbc6fef95f1d4fc0159494c5af73ea 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -497,8 +497,8 @@ int ap_open_logs(apr_pool_t *pconf, apr_pool_t *p /* plog */,
              * as stdin. This in turn would prevent the piped logger from
              * exiting.
              */
-             apr_file_close(s_main->error_log);
-             s_main->error_log = stderr_log;
+            apr_file_close(s_main->error_log);
+            s_main->error_log = stderr_log;
         }
     }
     /* note that stderr may still need to be replaced with something
@@ -624,7 +624,7 @@ static int log_ctime(const ap_errorlog_info *info, const char *arg,
     int time_len = buflen;
     int option = AP_CTIME_OPTION_NONE;
 
-    while(arg && *arg) {
+    while (arg && *arg) {
         switch (*arg) {
             case 'u':   option |= AP_CTIME_OPTION_USEC;
                         break;