From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 3 Oct 2011 20:27:34 +0000 (-0600)
Subject: Merged from parent (trunk r11763, v3.2.0.12+).
X-Git-Tag: BumpSslServerFirst.take01~123^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a10f3c2653ce366cf10afc7d6eb277dee44f34a;p=thirdparty%2Fsquid.git

Merged from parent (trunk r11763, v3.2.0.12+).
---

2a10f3c2653ce366cf10afc7d6eb277dee44f34a
diff --cc src/DiskIO/DiskFile.h
index 506525fd9f,8b3a777f0d..d5f542d45f
--- a/src/DiskIO/DiskFile.h
+++ b/src/DiskIO/DiskFile.h
@@@ -49,9 -49,10 +49,10 @@@ class DiskFile : public RefCountabl
  public:
  
      /// generally useful configuration options supported by some children
-     class Config {
+     class Config
+     {
      public:
 -        Config(): ioTimeout(0) {}
 +        Config(): ioTimeout(0), ioRate(-1) {}
  
          /// canRead/Write should return false if expected I/O delay exceeds it
          time_msec_t ioTimeout; // not enforced if zero, which is the default