Merge from trunk

diff --cc src/errorpage.cc
Simple merge

diff --cc src/ftp.cc
index 68bb44818c30d6386949bba042504430fc185cf5,c8c67962e446d4f43cf8fc577615f20055fb6375..781dc67b888fcd5fdd90a4bd3a2c83ca14fcae3a
--- 1/src/ftp.cc
--- 2/src/ftp.cc
+++ b/src/ftp.cc
@@@ -576,15 -660,21 +572,14 @@@ FtpStateData::listingFinish(
          const char *path = flags.dir_slash ? filepath : ".";
          printfReplyBody("<A HREF=\"%s/\">[As extended directory]</A>\n", rfc1738_escape_part(path));
      }
 -
 -    printfReplyBody("<HR noshade size=\"1px\">\n");
 -    printfReplyBody("<ADDRESS>\n");
 -    printfReplyBody("Generated %s by %s (%s)\n",
 -                    mkrfc1123(squid_curtime),
 -                    getMyHostname(),
 -                    visible_appname_string);
 -    printfReplyBody("</ADDRESS></BODY></HTML>\n");
  }
 +#endif /* DEAD_CODE */
  
  /// \ingroup ServerProtocolFTPInternal
- static const char *Month[] =
-     {
-         "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-     };
+ static const char *Month[] = {
+     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+ };
  
  /// \ingroup ServerProtocolFTPInternal
  static int
@@@ -1238,18 -1407,17 +1229,16 @@@ FtpStateData::processReplyBody(
  
  #endif
  
 -    if (flags.isdir && !flags.listing_started)
 -        listingStart();
 -
      if (flags.isdir) {
- 
 +        flags.listing = 1;
 +        listing.reset();
          parseListing();
 -    } else
 -        if (const int csize = data.readBuf->contentSize()) {
 -            writeReplyBody(data.readBuf->content(), csize);
 -            debugs(9, 5, HERE << "consuming " << csize << " bytes of readBuf");
 -            data.readBuf->consume(csize);
 -        }
 +        return;
- 
 +    } else if (const int csize = data.readBuf->contentSize()) {
 +        writeReplyBody(data.readBuf->content(), csize);
 +        debugs(9, 5, HERE << "consuming " << csize << " bytes of readBuf");
 +        data.readBuf->consume(csize);
 +    }
  
      entry->flush();