0
@@ -77,5 +77,6 @@ end
0
 
0
 if $0 == __FILE__
0
   require DIR + '/../ruby_lib/ebb'
0
-  server = Ebb::start_server(SimpleApp.new, :port => 4001)
0
+  server = Ebb::start_server(SimpleApp.new, :unix_socket => '/tmp/ebb.sock')
0
+  #server = Ebb::start_server(SimpleApp.new, :port => 4001)
0
 end

0
@@ -483,13 +483,13 @@ void ebb_server_unlisten(ebb_server *server)
0
 
0
 int ebb_server_listen_on_fd(ebb_server *server, const int sfd)
0
 {
0
-  set_nonblock(sfd);
0
-  
0
   if (listen(sfd, EBB_MAX_CLIENTS) < 0) {
0
     perror("listen()");
0
     return -1;
0
   }
0
   
0
+  set_nonblock(sfd); /* XXX: superfluous? */
0
+  
0
   server->fd = sfd;
0
   assert(server->port == NULL);
0
   assert(server->socketpath == NULL);
0
@@ -567,8 +567,9 @@ int ebb_server_listen_on_unix_socket(ebb_server *server, const char *socketpath)
0
   }
0
   
0
   /* Clean up a previous socket file if we left it around */
0
-  if(lstat(socketpath, &tstat) == 0 && S_ISSOCK(tstat.st_mode))
0
+  if(lstat(socketpath, &tstat) == 0 && S_ISSOCK(tstat.st_mode)) {
0
     unlink(socketpath);
0
+  }
0
   
0
   flags = 1;
0
   setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
0
@@ -585,7 +586,7 @@ int ebb_server_listen_on_unix_socket(ebb_server *server, const char *socketpath)
0
   strcpy(addr.sun_path, socketpath);
0
   old_umask = umask( ~(access_mask & 0777) );
0
   
0
-  if( bind(sfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
0
+  if(bind(sfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
0
     perror("bind()");
0
     goto error;
0
   }

0
@@ -101,18 +101,32 @@ end
0
 class ServerTestSocket < ServerTest
0
   def get(path)
0
     socket = UNIXSocket.open(@socketfile)
0
-    socket.write("GET #{path} HTTP/1.0\r\n")
0
+    socket.write("GET #{path} HTTP/1.0\r\n\r\n")
0
     response = ""
0
-    while chunk = socket.recv(100)
0
+    while chunk = socket.read(100)
0
       response << chunk
0
     end
0
-    env = JSON.parse(response)
0
+    body = response.split("\r\n\r\n")[1]
0
+    env = JSON.parse(body)
0
+  ensure
0
+    socket.close if socket
0
+  end
0
+  
0
+  def post(path, data)
0
+    socket = UNIXSocket.open(@socketfile)
0
+    socket.write("POST #{path} HTTP/1.0\r\nContent-Length: #{data.length}\r\n\r\n#{data}")
0
+    response = ""
0
+    while chunk = socket.read(100)
0
+      response << chunk
0
+    end
0
+    body = response.split("\r\n\r\n")[1]
0
+    env = JSON.parse(body)
0
   ensure
0
     socket.close if socket
0
   end
0
   
0
   def setup
0
-    @socketfile = '/tmp/ebb_socket.sock'
0
+    @socketfile = '/tmp/ebb_unittest.sock'
0
     Thread.new { Ebb.start_server(HelperApp.new, :unix_socket => @socketfile) }
0
     sleep 0.1 until Ebb.running?
0
   end