From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 21 Apr 2013 00:26:45 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git.sesse.net/www/cubemap
X-Git-Tag: 1.0.0~49
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=dc109293b2644d5f1ac85a3f02b3584e82dcf690;hp=-c

Merge branch 'master' of /srv/git.sesse.net/www/cubemap
---

dc109293b2644d5f1ac85a3f02b3584e82dcf690
diff --combined httpinput.cpp
index 2a101bd,e54aedb..e113c57
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@@ -1,3 -1,4 +1,3 @@@
 -#include <stdio.h>
  #include <assert.h>
  #include <errno.h>
  #include <netdb.h>
@@@ -8,7 -9,6 +8,7 @@@
  #include <string.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
 +#include <time.h>
  #include <unistd.h>
  #include <map>
  #include <string>
@@@ -62,7 -62,9 +62,9 @@@ HTTPInput::HTTPInput(const InputProto &
  
  void HTTPInput::close_socket()
  {
- 	safe_close(sock);
+ 	if (sock != -1) {
+ 		safe_close(sock);
+ 	}
  }
  
  InputProto HTTPInput::serialize() const