changeset 4607:eb21d16531ce

Merge.
author Sebastian Geerken
date So, 26 Jun 2016 14:22:56 +0200
parents a17dd6e20b79 (current diff) 5a7e265d3d42 (diff)
children cfddd7418189
files
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/dillorc	So Jun 26 14:22:19 2016 +0200
+++ b/dillorc	So Jun 26 14:22:56 2016 +0200
@@ -186,7 +186,7 @@
 # Overall, this is a valuable security measure against TLS stripping
 # attacks, etc., but in principle a site could contrive to use this as a
 # tracking mechanism. The term is "HSTS super cookie", although note that these
-* HSTS directives are not saved between browser sessions.
+# HSTS directives are not saved between browser sessions.
 #http_strict_transport_security=YES
 
 # Set the proxy information for http/https.
--- a/src/prefsparser.cc	So Jun 26 14:22:19 2016 +0200
+++ b/src/prefsparser.cc	So Jun 26 14:22:56 2016 +0200
@@ -142,7 +142,7 @@
 void PrefsParser::parse(FILE *fp)
 {
    char *line, *name, *value, *oldLocale;
-   int st;
+   int st, line_number = 1;
 
    /* Symbol array, sorted alphabetically */
    static SymNode_t symbols[] = {
@@ -246,11 +246,11 @@
          _MSG("prefsparser: name=%s, value=%s\n", name, value);
          parseOption(name, value, symbols, sizeof(symbols) / sizeof(symbols[0]));
       } else if (st < 0) {
-         MSG_ERR("prefsparser: Syntax error in dillorc:"
-                 " name=\"%s\" value=\"%s\"\n", name, value);
+         MSG_ERR("prefsparser: Syntax error in dillorc line %d:"
+                 " name=\"%s\" value=\"%s\"\n", line_number, name, value);
       }
-
       dFree(line);
+      line_number++;
    }
    fclose(fp);