summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc1
-rw-r--r--src/eyefiworker.cc2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 9650ec1..0bf26c4 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -114,8 +114,9 @@ int eyefiService::MarkLastPhotoInRoll(
syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
_exit(-1);
}
}
+ keep_alive = 0;
return SOAP_OK;
}
int eyefiService::UploadPhoto(
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index 4038658..90c2bc2 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -4,8 +4,9 @@
eyefiworker::eyefiworker()
: eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) {
bind_flags = SO_REUSEADDR; max_keep_alive = 0;
+ socket_flags = MSG_NOSIGNAL;
}
int eyefiworker::run(int port) {
if(!soap_valid_socket(bind(0,port,5)))
@@ -16,8 +17,9 @@ int eyefiworker::run(int port) {
throw std::runtime_error("failed to accept()");
pid_t p = fork();
if(p<0) throw std::runtime_error("failed to fork()");
if(!p) {
+ recv_timeout = 600; send_timeout = 120;
(void)serve();
soap_destroy(this); soap_end(this); soap_done(this);
_exit(0);
}