mirror of
https://github.com/rkd77/elinks.git
synced 2024-12-04 14:46:47 -05:00
Merge with git+ssh://pasky.or.cz/srv/git/elinks.git
This commit is contained in:
commit
a9907297b4
@ -156,7 +156,7 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri)
|
|||||||
}
|
}
|
||||||
|
|
||||||
printf("<html><head><title>%s</title><base href=\"%s\">"
|
printf("<html><head><title>%s</title><base href=\"%s\">"
|
||||||
"</head><body><pre>", buf.source, buf.source);
|
"</head><body><pre>", buf.source, buf.source);
|
||||||
|
|
||||||
dir = fsp_opendir(ses, data);
|
dir = fsp_opendir(ses, data);
|
||||||
if (!dir) goto end;
|
if (!dir) goto end;
|
||||||
@ -239,10 +239,10 @@ fsp_got_data(struct socket *socket, struct read_buffer *rb)
|
|||||||
abort_connection(conn, -errno);
|
abort_connection(conn, -errno);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len == 0) {
|
if (len == 0) {
|
||||||
if (conn->from)
|
if (conn->from)
|
||||||
normalize_cache_entry(conn->cached, conn->from);
|
normalize_cache_entry(conn->cached, conn->from);
|
||||||
close_socket(socket);
|
|
||||||
abort_connection(conn, S_OK);
|
abort_connection(conn, S_OK);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -253,6 +253,7 @@ fsp_got_data(struct socket *socket, struct read_buffer *rb)
|
|||||||
conn->tries = 0;
|
conn->tries = 0;
|
||||||
conn->from += len;
|
conn->from += len;
|
||||||
kill_buffer_data(rb, len);
|
kill_buffer_data(rb, len);
|
||||||
|
|
||||||
read_from_socket(socket, rb, S_TRANS, fsp_got_data);
|
read_from_socket(socket, rb, S_TRANS, fsp_got_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -263,7 +264,7 @@ void
|
|||||||
fsp_protocol_handler(struct connection *conn)
|
fsp_protocol_handler(struct connection *conn)
|
||||||
{
|
{
|
||||||
int fsp_pipe[2] = { -1, -1 };
|
int fsp_pipe[2] = { -1, -1 };
|
||||||
int cpid;
|
pid_t cpid;
|
||||||
struct read_buffer *buf;
|
struct read_buffer *buf;
|
||||||
|
|
||||||
if (c_pipe(fsp_pipe)) {
|
if (c_pipe(fsp_pipe)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user