[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-291
From: |
Giuseppe Scrivano |
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-291-g556703b |
Date: |
Sun, 08 Aug 2010 17:48:24 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".
The branch, master has been updated
via 556703b68cca205286663c76a16c324377954797 (commit)
via ad8601680defc5d6de454909938712b331e85ebf (commit)
from 61ba823d81d5b1e050f8065f54680644801f27ec (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 556703b68cca205286663c76a16c324377954797
Author: Giuseppe Scrivano <address@hidden>
Date: Sun Aug 8 19:46:08 2010 +0200
Proxy: Prevent a double initial slash in request.
diff --git a/myserver/src/http_handler/proxy/proxy.cpp
b/myserver/src/http_handler/proxy/proxy.cpp
index 4163a66..1b6b679 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -71,9 +71,11 @@ int Proxy::send (HttpThreadContext *td, const char*
scriptpath,
{
req.ver.assign ("HTTP/1.1");
req.cmd.assign (td->request.cmd);
- req.uri.assign ("/");
+ if (destUrl.getResource ()[0] != '/')
+ req.uri.assign ("/");
req.uri.append (destUrl.getResource ());
req.uri.append (td->pathInfo);
+
req.setValue ("Connection", "keep-alive");
if (td->request.uriOptsPtr)
{
commit ad8601680defc5d6de454909938712b331e85ebf
Author: Giuseppe Scrivano <address@hidden>
Date: Sun Aug 8 19:17:05 2010 +0200
select: Adjust multipliers for timeout.
diff --git a/myserver/src/base/socket/socket.cpp
b/myserver/src/base/socket/socket.cpp
index 27ba6f8..00ebdea 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -530,7 +530,7 @@ int Socket::connect (MYSERVER_SOCKADDR* sa, int na)
*/
int Socket::recv (char* buffer, int len, int flags, u_long timeout)
{
- int ret = dataAvailable (timeout / 1000, timeout % 1000);
+ int ret = dataAvailable (timeout / 1000000, timeout % 1000000);
if (ret)
return recv (buffer, len, flags);
-----------------------------------------------------------------------
Summary of changes:
myserver/src/base/socket/socket.cpp | 2 +-
myserver/src/http_handler/proxy/proxy.cpp | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU MyServer
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-291-g556703b,
Giuseppe Scrivano <=