Merge r1730128, r1878140, r1878265, r1881736, r1882775, r1883872, r1884509, r1887720 from trunk

  *) Easy patches: synch 2.4.x and trunk
         - doxygen: Correct doxygen groupname
         - .gdbinit: align columns
         - .gdbinit: fix indentation
         - mod_dav: Add specific logs for different modes
         - core: ap_pbase64encode(): save double NUL byte allocation and assignment
         - core: ap_pbase64decode(): save double NUL byte allocation and assignment
         - support: Fix a typo in a comment
         - proxy_util.c: Fix leak in error path in the do_malloc case

Submitted by: wrowe, ylavic, ylavic, jorton, rpluem, ylavic, jorton, jorton
Reviewed by: jailletc36, gbechis, ylavic
Backported by: jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1888929 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 15 deletions

diff --git a/.gdbinit b/.gdbinit
index 871610b06a..8879865cda 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -6,12 +6,12 @@ define dump_table
     set $n = ((apr_array_header_t *)$arg0)->nelts
     set $i = 0
     while $i < $n
-    if $t[$i].val == (void *)0L
-        printf "[%u] '%s'=>NULL\n", $i, $t[$i].key
-    else
-        printf "[%u] '%s'='%s' [%p]\n", $i, $t[$i].key, $t[$i].val, $t[$i].val
-    end
-    set $i = $i + 1
+        if $t[$i].val == (void *)0L
+            printf "[%u] '%s'=>NULL\n", $i, $t[$i].key
+        else
+            printf "[%u] '%s'='%s' [%p]\n", $i, $t[$i].key, $t[$i].val, $t[$i].val
+        end
+        set $i = $i + 1
     end
 end
 document dump_table
@@ -157,7 +157,7 @@ define dump_bucket_ex
         set $fd = ((apr_bucket_file*)$bucket->data)->fd->filedes
         print_bkt_datacol "contents" "[***file***] fd=%-6ld" (long)$fd $sh
         set $refcount = ((apr_bucket_refcount *)$bucket->data)->refcount
-        print_bkt_datacol "rc" "%d" $refcount $sh
+        print_bkt_datacol "rc" "%-3d" $refcount $sh
 
     else
     if (($bucket->type == &apr_bucket_type_heap)      || \
@@ -223,7 +223,7 @@ define dump_bucket_ex
         end
 
         if $refcount != -1
-            print_bkt_datacol "rc" "%d" $refcount $sh
+            print_bkt_datacol "rc" "%-3d" $refcount $sh
         else
             print_bkt_datacol "rc" "n/%c" 'a' $sh
         end
@@ -232,25 +232,25 @@ define dump_bucket_ex
         if ($bucket->type == &apr_bucket_type_pipe)
 
             # pipe bucket, can show fd
-            set $fd = ((apr_file_t*)$bucket->data)->filedes;
-            print_bkt_datacol "contents" "[***pipe***] fd=%-6ld" (long)$fd $sh
+            set $fd = ((apr_file_t*)$bucket->data)->filedes
+            print_bkt_datacol "contents" "[***pipe***] fd=%-3ld" (long)$fd $sh
 
         else
         if ($bucket->type == &apr_bucket_type_socket)
 
             # file bucket, can show fd
-            set $fd = ((apr_socket_t*)$bucket->data)->socketdes;
-            print_bkt_datacol "contents" "[**socket**] fd=%-6ld" (long)$fd $sh
+            set $fd = ((apr_socket_t*)$bucket->data)->socketdes
+            print_bkt_datacol "contents" "[**socket**] fd=%-3ld" (long)$fd $sh
 
         else
 
             # 3rd-party bucket type
-            print_bkt_datacol "contents" "[**opaque**]%-10c" ' ' $sh
+            print_bkt_datacol "contents" "[**opaque**]%-7c" ' ' $sh
         end
         end
 
         # no refcount
-        printf "         "
+        printf "   "
         print_bkt_datacol "rc" "n/%c" 'a' $sh
     end
     end
@@ -277,7 +277,7 @@ define dump_brigade
 
     printf "   | type     (address)      | length | "
     printf "data address | contents               | rc\n"
-    printf "------------------------------------------"
+    printf "-------------------------------------------"
     printf "----------------------------------------\n"
 
     if $bucket == $sentinel