Patch in fix from trunk for ModPagespeedImgMaxRewritesAtOnce
diff --git a/src/net/instaweb/apache/mod_instaweb.cc b/src/net/instaweb/apache/mod_instaweb.cc
index 48f8486..1d6de9e 100644
--- a/src/net/instaweb/apache/mod_instaweb.cc
+++ b/src/net/instaweb/apache/mod_instaweb.cc
@@ -827,6 +827,8 @@
"Javascript resources will be outlined."),
APACHE_CONFIG_DIR_OPTION(kModPagespeedImgInlineMaxBytes,
"Number of bytes below which images will be inlined."),
+ APACHE_CONFIG_OPTION(kModPagespeedImgMaxRewritesAtOnce,
+ "Set bound on number of images being rewritten at one time (0 = unbounded)."),
APACHE_CONFIG_DIR_OPTION(kModPagespeedJsInlineMaxBytes,
"Number of bytes below which javascript will be inlined."),
APACHE_CONFIG_DIR_OPTION(kModPagespeedCssInlineMaxBytes,
diff --git a/src/net/instaweb/util/string_util.cc b/src/net/instaweb/util/string_util.cc
index 36f9c39..990321b 100644
--- a/src/net/instaweb/util/string_util.cc
+++ b/src/net/instaweb/util/string_util.cc
@@ -97,7 +97,7 @@
const char ch = input[index];
// If we see a quoted section, treat it as a single item even if there are
// spaces in it.
- if (ch == '"' or ch == '\'') {
+ if (ch == '"' || ch == '\'') {
const char quote = ch;
++index; // skip open quote
output->push_back("");
