Merging debian version 1.9.4-1.

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

1 files changed, 0 insertions, 81 deletions

diff --git a/debian/vendor-h2o/include/h2o/serverutil.h b/debian/vendor-h2o/include/h2o/serverutil.h
deleted file mode 100644
index 7698cdc..0000000
--- a/debian/vendor-h2o/include/h2o/serverutil.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2014 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 h2o__server_starter_h
-#define h2o__server_starter_h
-
-#include <stddef.h>
-
-/* taken from sysexits.h */
-#ifndef EX_SOFTWARE
-#define EX_SOFTWARE 70
-#endif
-#ifndef EX_OSERR
-#define EX_OSERR 71
-#endif
-#ifndef EX_TEMPFAIL
-#define EX_TEMPFAIL 75
-#endif
-#ifndef EX_CONFIG
-#define EX_CONFIG 78
-#endif
-
-/**
- * equivalent of signal(3)
- */
-void h2o_set_signal_handler(int signo, void (*cb)(int signo));
-
-/**
- * equiv. to setuidgid of djb
- */
-int h2o_setuidgid(const char *user);
-
-/**
- * return a list of fds passed in from Server::Starter, or 0 if Server::Starter was not used.  -1 on error
- */
-size_t h2o_server_starter_get_fds(int **_fds);
-
-/**
- * spawns a command with given arguments, while mapping the designated file descriptors.
- * @param cmd file being executed
- * @param argv argv passed to the executable
- * @param mapped_fds if non-NULL, must point to an array contain containing a list of pair of file descriptors, terminated with -1.
- *        Every pair of the mapping will be duplicated by calling `dup2` before execvp is being called if the second value of the
- *        pair is not -1.  If the second value is -1, then `close` is called with the first value as the argument.
- * @return pid of the process being spawned if successful, or -1 if otherwise
- */
-pid_t h2o_spawnp(const char *cmd, char *const *argv, const int *mapped_fds, int clocexec_mutex_is_locked);
-
-/**
- * executes a command and returns its output
- * @param cmd
- * @param argv
- * @param resp the output, only available if the function returns zero
- * @param child_status result of waitpid(child_pid), only available if the function returns zero
- */
-int h2o_read_command(const char *cmd, char **argv, h2o_buffer_t **resp, int *child_status);
-
-/**
- * Gets the number of processor cores
- */
-size_t h2o_numproc(void);
-
-#endif