forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add unix domain socket support for scgi (and httpd but idk if that is useful)

This commit is contained in:
Adam D. Ruppe 2019-03-09 17:40:13 -05:00
parent b426390abe
commit 6acfc5cb6e
1 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
cgi.d
View File

@ -3752,10 +3752,12 @@ class ListeningConnectionManager {
while(!loopBroken && running) { while(!loopBroken && running) {
auto sn = listener.accept(); auto sn = listener.accept();
// disable Nagle's algorithm to avoid a 40ms delay when we send/recv if(tcp) {
// on the socket because we do some buffering internally. I think this helps, // disable Nagle's algorithm to avoid a 40ms delay when we send/recv
// certainly does for small requests, and I think it does for larger ones too // on the socket because we do some buffering internally. I think this helps,
sn.setOption(SocketOptionLevel.TCP, SocketOption.TCP_NODELAY, 1); // certainly does for small requests, and I think it does for larger ones too
sn.setOption(SocketOptionLevel.TCP, SocketOption.TCP_NODELAY, 1);
}
while(queueLength >= queue.length) while(queueLength >= queue.length)
Thread.sleep(1.msecs); Thread.sleep(1.msecs);
synchronized(this) { synchronized(this) {
@ -3771,14 +3773,49 @@ class ListeningConnectionManager {
} }
} }
} }
// FIXME: i typically stop this with ctrl+c which never
// actually gets here. i need to do a sigint handler.
if(cleanup)
cleanup();
} }
} }
bool tcp;
void delegate() cleanup;
this(string host, ushort port, void function(Socket) handler) { this(string host, ushort port, void function(Socket) handler) {
this.handler = handler; this.handler = handler;
listener = new TcpSocket();
listener.setOption(SocketOptionLevel.SOCKET, SocketOption.REUSEADDR, true); if(host.startsWith("unix:")) {
listener.bind(host.length ? parseAddress(host, port) : new InternetAddress(port)); version(Posix) {
listener = new Socket(AddressFamily.UNIX, SocketType.STREAM);
string filename = host["unix:".length .. $].idup;
listener.bind(new UnixAddress(filename));
cleanup = delegate() {
import std.file;
remove(filename);
};
tcp = false;
} else {
throw new Exception("unix sockets not supported on this system");
}
} else if(host.startsWith("abstract:")) {
version(linux) {
listener = new Socket(AddressFamily.UNIX, SocketType.STREAM);
string filename = "\0" ~ host["abstract:".length .. $];
listener.bind(new UnixAddress(filename));
tcp = false;
} else {
throw new Exception("abstract unix sockets not supported on this system");
}
} else {
listener = new TcpSocket();
listener.setOption(SocketOptionLevel.SOCKET, SocketOption.REUSEADDR, true);
listener.bind(host.length ? parseAddress(host, port) : new InternetAddress(port));
tcp = true;
}
listener.listen(128); listener.listen(128);
} }
@ -4501,8 +4538,8 @@ version(Posix) {
alias CgiConnectionHandle = void*; // Doesn't actually work! But I don't want compile to fail pointlessly at this point. alias CgiConnectionHandle = void*; // Doesn't actually work! But I don't want compile to fail pointlessly at this point.
enum INVALID_CGI_CONNECTION_HANDLE = null; enum INVALID_CGI_CONNECTION_HANDLE = null;
} else version(scgi) { } else version(scgi) {
alias CgiConnectionHandle = HANDLE; alias CgiConnectionHandle = SOCKET;
enum INVALID_CGI_CONNECTION_HANDLE = null; enum INVALID_CGI_CONNECTION_HANDLE = INVALID_SOCKET;
} else { /* version(plain_cgi) */ } else { /* version(plain_cgi) */
alias CgiConnectionHandle = HANDLE; alias CgiConnectionHandle = HANDLE;
enum INVALID_CGI_CONNECTION_HANDLE = null; enum INVALID_CGI_CONNECTION_HANDLE = null;