[GNUnet-SVN] r5044 - libmicrohttpd/src/daemon

[gnunet]

Author: grothoff
Date: 2007-06-13 17:03:21 -0600 (Wed, 13 Jun 2007)
New Revision: 5044

Modified:
   libmicrohttpd/src/daemon/daemon.c
   libmicrohttpd/src/daemon/session.c
Log:
fix

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2007-06-13 23:01:21 UTC (rev 5043)
+++ libmicrohttpd/src/daemon/daemon.c   2007-06-13 23:03:21 UTC (rev 5044)
@@ -58,7 +58,7 @@
       return MHD_NO;
     ah = ah->next;
   }
-  ah = malloc(sizeof(struct MHD_AccessHandler));
+  ah = malloc(sizeof(struct MHD_Access_Handler));
   ah->next = daemon->handlers;
   ah->uri_prefix = strdup(uri_prefix);
   ah->dh = dh;

Modified: libmicrohttpd/src/daemon/session.c
===================================================================
--- libmicrohttpd/src/daemon/session.c  2007-06-13 23:01:21 UTC (rev 5043)
+++ libmicrohttpd/src/daemon/session.c  2007-06-13 23:03:21 UTC (rev 5044)
@@ -165,7 +165,7 @@
          (rbuf[pos] != '\r') &&
          (rbuf[pos] != '\n') )
     pos++;
-  if (pos == session->readLoc) {
+  if (pos == session->readLoc - 1) {
     /* not found, consider growing... */
     if (session->readLoc == session->read_buffer_size) {
       /* grow buffer to read larger header or die... */
@@ -194,8 +194,8 @@
         session->read_buffer,
         pos-1);
   rbuf[pos-1] = '\0';
-  if ( (rbuf[pos] == '\r') &&
-       (rbuf[pos+1] == '\n') )
+  if ( (session->read_buffer[pos] == '\r') &&       
+       (session->read_buffer[pos+1] == '\n') )
     pos++; /* skip both r and n */
   pos++; 
   memmove(session->read_buffer,