fix nginx build and config (for *nix, esp Mac) and a webserver regres…

…sion
Keno · Oct 29, 2012 · e59566e · e59566e
1 parent cce06c3
commit e59566e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/deps/Makefile b/deps/Makefile
@@ -879,7 +879,7 @@ NGINX_FLAGS += \
 	--with-ld-opt="-L'$(USRLIB)' -lpcre"
 else
 NGINX_FLAGS += \
-	--with-ld-opt="-L'$(USRLIB)' -lpcre"
+	--with-ld-opt="-L'$(USRLIB)' -lpcre -Wl,-rpath,$(USRLIB) $(RPATH)"
 endif
 
 compile-nginx: install-nginx

diff --git a/deps/nginx.conf b/deps/nginx.conf
@@ -1,6 +1,6 @@
 error_log logs/nginx.log info;
 events {
-	worker_connections 1024;
+	worker_connections 256;
 }
 http {
 	access_log logs/access.log combined;
@@ -26,7 +26,7 @@ http {
 		}
 
 		location / {
-			root ../lib/julia/ui/website;
+			root lib/julia/ui/website;
 		}
 	}
 }
diff --git a/ui/webserver/webserver.cpp b/ui/webserver/webserver.cpp
@@ -1028,8 +1028,8 @@ void get_response(request* req,uv_stream_t *client)
     buf.base=p->cstr;
     buf.len=response.size();
     uv_write_t *wr = new uv_write_t;
+    wr->data=(void*)buf.base;
     uv_write(wr,(uv_stream_t*)client,&buf,1,&free_write_buffer);
-    //wr->data=(void*)buf.base;
 
     // destroySoon the connection to the client
     uv_shutdown_t *sr = new uv_shutdown_t;