Merging debian version 1.9.4-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 0 insertions, 129 deletions

diff --git a/debian/vendor-h2o/deps/cloexec/cloexec.c b/debian/vendor-h2o/deps/cloexec/cloexec.c
deleted file mode 100644
index bc67c39..0000000
--- a/debian/vendor-h2o/deps/cloexec/cloexec.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2015 DeNA Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#include <fcntl.h>
-#include "cloexec.h"
-
-pthread_mutex_t cloexec_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static int set_cloexec(int fd)
-{
-    return fcntl(fd, F_SETFD, FD_CLOEXEC) != -1 ? 0 : -1;
-}
-
-/*
- * note: the socket must be in non-blocking mode, or the call might block while the mutex is being locked
- */
-int cloexec_accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-{
-    int fd = -1;
-    pthread_mutex_lock(&cloexec_mutex);
-
-    if ((fd = accept(socket, addr, addrlen)) == -1)
-        goto Exit;
-    if (set_cloexec(fd) != 0) {
-        close(fd);
-        fd = -1;
-        goto Exit;
-    }
-
-Exit:
-    pthread_mutex_unlock(&cloexec_mutex);
-    return fd;
-}
-
-int cloexec_pipe(int fds[2])
-{
-#ifdef __linux__
-    return pipe2(fds, O_CLOEXEC);
-#else
-    int ret = -1;
-    pthread_mutex_lock(&cloexec_mutex);
-
-    if (pipe(fds) != 0)
-        goto Exit;
-    if (set_cloexec(fds[0]) != 0 || set_cloexec(fds[1]) != 0)
-        goto Exit;
-    ret = 0;
-
-Exit:
-    pthread_mutex_unlock(&cloexec_mutex);
-    return ret;
-#endif
-}
-
-int cloexec_socket(int domain, int type, int protocol)
-{
-#ifdef __linux__
-    return socket(domain, type | SOCK_CLOEXEC, protocol);
-#else
-    int fd = -1;
-    pthread_mutex_lock(&cloexec_mutex);
-
-    if ((fd = socket(domain, type, protocol)) == -1)
-        goto Exit;
-    if (set_cloexec(fd) != 0) {
-        close(fd);
-        fd = -1;
-        goto Exit;
-    }
-
-Exit:
-    pthread_mutex_unlock(&cloexec_mutex);
-    return fd;
-#endif
-}
diff --git a/debian/vendor-h2o/deps/cloexec/cloexec.h b/debian/vendor-h2o/deps/cloexec/cloexec.h
deleted file mode 100644
index 53987ed..0000000
--- a/debian/vendor-h2o/deps/cloexec/cloexec.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015 DeNA Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#ifndef CLOEXEC_H
-#define CLOEXEC_H
-
-#include <pthread.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-extern pthread_mutex_t cloexec_mutex;
-
-int cloexec_accept(int socket, struct sockaddr *addr, socklen_t *addrlen);
-int cloexec_pipe(int fds[2]);
-int cloexec_socket(int domain, int type, int protocol);
-
-#endif