diff --git a/lib/core/common.py b/lib/core/common.py index 47e76b536..62949147c 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1366,19 +1366,26 @@ def getBruteUnicode(string): class UnicodeRawConfigParser(RawConfigParser): def write(self, fp): - """Write an .ini-format representation of the configuration state.""" + """ + Write an .ini-format representation of the configuration state. + """ + if self._defaults: fp.write("[%s]\n" % DEFAULTSECT) + for (key, value) in self._defaults.items(): fp.write("%s = %s\n" % (key, getUnicode(value).replace('\n', '\n\t'))) + fp.write("\n") + for section in self._sections: fp.write("[%s]\n" % section) + for (key, value) in self._sections[section].items(): if key != "__name__": if value is None: fp.write("%s\n" % (key)) else: - fp.write("%s = %s\n" % - (key, getUnicode(value).replace('\n', '\n\t'))) + fp.write("%s = %s\n" % (key, getUnicode(value).replace('\n', '\n\t'))) + fp.write("\n") diff --git a/lib/core/option.py b/lib/core/option.py index de9ccb412..d66135ae9 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -91,13 +91,15 @@ def __urllib2Opener(): logger.debug(debugMsg) handlers = [proxyHandler, authHandler, redirectHandler] + if not conf.dropSetCookie: conf.cj = cookielib.LWPCookieJar() handlers.append(urllib2.HTTPCookieProcessor(conf.cj)) + if conf.keepAlive: handlers.append(keepAliveHandler) - opener = urllib2.build_opener(*handlers) + opener = urllib2.build_opener(*handlers) urllib2.install_opener(opener) def __feedTargetsDict(reqFile, addedTargetUrls): @@ -702,7 +704,6 @@ def __setHTTPExtraHeaders(): if header and value: conf.httpHeaders.append((header, value)) - else: conf.httpHeaders.append(("Accept", "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5")) conf.httpHeaders.append(("Accept-Language", "en-us,en;q=0.5"))