Commit 7b8f3fcd authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge remote branch 'origin/devel-2.0' into devel-2.1



* origin/devel-2.0:
  Fix two potentially endless loops in http library
  Update NEWS file and bump version to 2.0.6
  ganeti-cleaner: does 'echo 0' instead of 'exit 0'

Conflicts:
	NEWS: Trivial
	configure.ac: Trivial
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 2826b361 0be13136
......@@ -101,6 +101,15 @@ Details
- Improved burnin
Version 2.0.6
-------------
- Fix cleaner behaviour on nodes not in a cluster (Debian bug 568105)
- Fix a string formatting bug
- Improve safety of the code in some error paths
- Improve data validation in the master of values returned from nodes
Version 2.0.5
-------------
......
......@@ -27,7 +27,7 @@ QUEUE_ARCHIVE_DIR=$DATA_DIR/queue/archive
REMOVE_AFTER=21
# Exit if machine is not part of a cluster
[[ -e $DATA_DIR/ssconf_master_node ]] || echo 0
[[ -e $DATA_DIR/ssconf_master_node ]] || exit 0
# Exit if queue archive directory doesn't exist
[[ -d $QUEUE_ARCHIVE_DIR ]] || exit 0
......
......@@ -403,9 +403,9 @@ def SocketOperation(sock, op, arg1, timeout):
if event is None:
raise HttpSocketTimeout()
if (op == SOCKOP_RECV and
event & (select.POLLNVAL | select.POLLHUP | select.POLLERR)):
return ""
if event & (select.POLLNVAL | select.POLLHUP | select.POLLERR):
# Let the socket functions handle these
break
if not event & wait_for_event:
continue
......@@ -862,7 +862,7 @@ class HttpMessageReader(object):
# the CRLF."
if idx == 0:
# TODO: Limit number of CRLFs/empty lines for safety?
buf = buf[:2]
buf = buf[2:]
continue
if idx > 0:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment