[myserver-commit] [SCM] GNU MyServer branch, master, updated. b7d9283c0f31178d76feb16daf8644c3c5f568e6

[Giuseppe Scrivano]

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  b7d9283c0f31178d76feb16daf8644c3c5f568e6 (commit)
       via  8507d31fa365347ab8722a735f41a769dd5348f6 (commit)
      from  52f78e0ef8e476724fc62c2331c9148b994e44f7 (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 b7d9283c0f31178d76feb16daf8644c3c5f568e6
Author: Giuseppe Scrivano <address@hidden>
Date:   Wed Oct 7 00:40:09 2009 +0200

    The HttpFile handler avoids to reset the HttpResponseHeader.

diff --git a/myserver/src/http_handler/http_file/http_file.cpp 
b/myserver/src/http_handler/http_file/http_file.cpp
index a5f105d..9cbc1eb 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -51,8 +51,6 @@ int HttpFile::putFile (HttpThreadContext* td,
 
   try
   {
-    HttpHeaders::buildDefaultHTTPResponseHeader (&td->response);
-
     if (td->request.isKeepAlive ())
       {
         td->response.setValue ("Connection", "keep-alive");
@@ -164,8 +162,6 @@ int HttpFile::deleteFile (HttpThreadContext* td,
   int ret;
   try
   {
-    HttpHeaders::buildDefaultHTTPResponseHeader (&td->response);
-
     if (!(td->permissions & MYSERVER_PERMISSION_DELETE))
       return td->http->sendAuth ();
 



commit 8507d31fa365347ab8722a735f41a769dd5348f6
Author: Giuseppe Scrivano <address@hidden>
Date:   Wed Oct 7 00:39:16 2009 +0200

    Store the value of the `mime' attribute.

diff --git a/myserver/src/conf/mime/mime_manager.cpp 
b/myserver/src/conf/mime/mime_manager.cpp
index e81b244..a4fa5f6 100644
--- a/myserver/src/conf/mime/mime_manager.cpp
+++ b/myserver/src/conf/mime/mime_manager.cpp
@@ -173,6 +173,10 @@ MimeRecord *MimeManager::readRecord (xmlNodePtr node)
       rc->selfExecuted = xmlStrcmp (attrs->children->content,
                                     (const xmlChar *)"YES");
 
+    if (!xmlStrcmp (attrs->name, (const xmlChar *)"mime") &&
+        attrs->children && attrs->children->content)
+      rc->mimeType.assign ((const char*)attrs->children->content);
+
     if (!xmlStrcmp (attrs->name, (const xmlChar *)"param") &&
         attrs->children && attrs->children->content)
       rc->cgiManager.assign ((const char*)attrs->children->content);

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/conf/mime/mime_manager.cpp           |    4 ++++
 myserver/src/http_handler/http_file/http_file.cpp |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU MyServer