projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test in git-init-db if the filemode can be trusted
[git.git]
/
daemon.c
diff --git
a/daemon.c
b/daemon.c
index
9ea6c31
..
c3f8641
100644
(file)
--- a/
daemon.c
+++ b/
daemon.c
@@
-1,5
+1,3
@@
-#include "cache.h"
-#include "pkt-line.h"
#include <signal.h>
#include <sys/wait.h>
#include <sys/socket.h>
#include <signal.h>
#include <sys/wait.h>
#include <sys/socket.h>
@@
-9,11
+7,15
@@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <syslog.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <syslog.h>
+#include "pkt-line.h"
+#include "cache.h"
static int log_syslog;
static int verbose;
static int log_syslog;
static int verbose;
-static const char daemon_usage[] = "git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all] [directory...]";
+static const char daemon_usage[] =
+"git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\n"
+" [--timeout=n] [--init-timeout=n] [directory...]";
/* List of acceptable pathname prefixes */
static char **ok_paths = NULL;
/* List of acceptable pathname prefixes */
static char **ok_paths = NULL;
@@
-21,6
+23,9
@@
static char **ok_paths = NULL;
/* If this is set, git-daemon-export-ok is not required */
static int export_all_trees = 0;
/* If this is set, git-daemon-export-ok is not required */
static int export_all_trees = 0;
+/* Timeout, and initial timeout */
+static unsigned int timeout = 0;
+static unsigned int init_timeout = 0;
static void logreport(int priority, const char *err, va_list params)
{
static void logreport(int priority, const char *err, va_list params)
{
@@
-140,11
+145,11
@@
static int set_dir(const char *dir)
if ( chdir(dir) )
return -1;
if ( chdir(dir) )
return -1;
-
+
/*
* Security on the cheap.
*
/*
* Security on the cheap.
*
- * We want a readable HEAD, usable "objects" directory, and
+ * We want a readable HEAD, usable "objects" directory, and
* a "git-daemon-export-ok" flag that says that the other side
* is ok with us doing this.
*/
* a "git-daemon-export-ok" flag that says that the other side
* is ok with us doing this.
*/
@@
-170,6
+175,8
@@
static int upload(char *dir)
/* Enough for the longest path above including final null */
int buflen = strlen(dir)+10;
char *dirbuf = xmalloc(buflen);
/* Enough for the longest path above including final null */
int buflen = strlen(dir)+10;
char *dirbuf = xmalloc(buflen);
+ /* Timeout as string */
+ char timeout_buf[64];
loginfo("Request for '%s'", dir);
loginfo("Request for '%s'", dir);
@@
-190,8
+197,10
@@
static int upload(char *dir)
*/
signal(SIGTERM, SIG_IGN);
*/
signal(SIGTERM, SIG_IGN);
+ snprintf(timeout_buf, sizeof timeout_buf, "--timeout=%u", timeout);
+
/* git-upload-pack only ever reads stuff, so this is safe */
/* git-upload-pack only ever reads stuff, so this is safe */
- execlp("git-upload-pack", "git-upload-pack", ".", NULL);
+ execlp("git-upload-pack", "git-upload-pack", "
--strict", timeout_buf, "
.", NULL);
return -1;
}
return -1;
}
@@
-200,7
+209,9
@@
static int execute(void)
static char line[1000];
int len;
static char line[1000];
int len;
+ alarm(init_timeout ? init_timeout : timeout);
len = packet_read_line(0, line, sizeof(line));
len = packet_read_line(0, line, sizeof(line));
+ alarm(0);
if (len && line[len-1] == '\n')
line[--len] = 0;
if (len && line[len-1] == '\n')
line[--len] = 0;
@@
-518,11
+529,11
@@
static int service_loop(int socknum, int *socklist)
}
signal(SIGCHLD, child_handler);
}
signal(SIGCHLD, child_handler);
-
+
for (;;) {
int i;
for (;;) {
int i;
- if (poll(pfd, socknum,
0
) < 0) {
+ if (poll(pfd, socknum,
-1
) < 0) {
if (errno != EINTR) {
error("poll failed, resuming: %s",
strerror(errno));
if (errno != EINTR) {
error("poll failed, resuming: %s",
strerror(errno));
@@
-555,13
+566,13
@@
static int service_loop(int socknum, int *socklist)
static int serve(int port)
{
int socknum, *socklist;
static int serve(int port)
{
int socknum, *socklist;
-
+
socknum = socksetup(port, &socklist);
if (socknum == 0)
die("unable to allocate any listen sockets on port %u", port);
socknum = socksetup(port, &socklist);
if (socknum == 0)
die("unable to allocate any listen sockets on port %u", port);
-
+
return service_loop(socknum, socklist);
return service_loop(socknum, socklist);
-}
+}
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
@@
-598,6
+609,12
@@
int main(int argc, char **argv)
export_all_trees = 1;
continue;
}
export_all_trees = 1;
continue;
}
+ if (!strncmp(arg, "--timeout=", 10)) {
+ timeout = atoi(arg+10);
+ }
+ if (!strncmp(arg, "--init-timeout=", 15)) {
+ init_timeout = atoi(arg+15);
+ }
if (!strcmp(arg, "--")) {
ok_paths = &argv[i+1];
break;
if (!strcmp(arg, "--")) {
ok_paths = &argv[i+1];
break;