libmicrohttpd

commit 9141692ad5b1e50c414d1f0cd1eef39a5f30b087
parent b483c0f6d336c47b4043b67230b841524daa46f6
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Tue, 10 Jan 2023 15:58:49 +0300

Renamed connection state for clarity

Diffstat:
M
src/lib/internal.c
 | 
2
+-
M
src/microhttpd/connection.c
 | 
12
++++++------
M
src/microhttpd/internal.c
 | 
4
++--
M
src/microhttpd/internal.h
 | 
4
++--

4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/lib/internal.c b/src/lib/internal.c
@@ -38,7 +38,7 @@ MHD_state_to_string (enum MHD_CONNECTION_STATE state)
   {
   case MHD_CONNECTION_INIT:
     return "connection init";
-  case MHD_CONNECTION_URL_RECEIVED:
+  case MHD_CONNECTION_REQ_LINE_RECEIVED:
     return "connection url received";
   case MHD_CONNECTION_HEADER_PART_RECEIVED:
     return "header partially received";
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
@@ -2655,7 +2655,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
     {
     case MHD_CONNECTION_INIT:
     case MHD_CONNECTION_REQ_LINE_RECEIVING:
-    case MHD_CONNECTION_URL_RECEIVED:
+    case MHD_CONNECTION_REQ_LINE_RECEIVED:
     case MHD_CONNECTION_HEADER_PART_RECEIVED:
       /* while reading headers, we always grow the
          read buffer if needed, no size-check required */
@@ -4769,7 +4769,7 @@ get_request_line (struct MHD_Connection *c)
     return true; /* Error in processing */
 
   memset (&c->rq.hdrs.hdr, 0, sizeof(c->rq.hdrs.hdr));
-  c->state = MHD_CONNECTION_URL_RECEIVED;
+  c->state = MHD_CONNECTION_REQ_LINE_RECEIVED;
   return true;
 }
 
@@ -4937,7 +4937,7 @@ MHD_connection_handle_read (struct MHD_Connection *connection,
   {
   case MHD_CONNECTION_INIT:
   case MHD_CONNECTION_REQ_LINE_RECEIVING:
-  case MHD_CONNECTION_URL_RECEIVED:
+  case MHD_CONNECTION_REQ_LINE_RECEIVED:
   case MHD_CONNECTION_HEADER_PART_RECEIVED:
   case MHD_CONNECTION_HEADERS_RECEIVED:
   case MHD_CONNECTION_HEADERS_PROCESSED:
@@ -5030,7 +5030,7 @@ MHD_connection_handle_write (struct MHD_Connection *connection)
   {
   case MHD_CONNECTION_INIT:
   case MHD_CONNECTION_REQ_LINE_RECEIVING:
-  case MHD_CONNECTION_URL_RECEIVED:
+  case MHD_CONNECTION_REQ_LINE_RECEIVED:
   case MHD_CONNECTION_HEADER_PART_RECEIVED:
   case MHD_CONNECTION_HEADERS_RECEIVED:
     mhd_assert (0);
@@ -5595,10 +5595,10 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
       }
       mhd_assert (MHD_CONNECTION_REQ_LINE_RECEIVING >= connection->state);
       break;
-    case MHD_CONNECTION_URL_RECEIVED:
+    case MHD_CONNECTION_REQ_LINE_RECEIVED:
       line = get_next_header_line (connection,
                                    NULL);
-      if (MHD_CONNECTION_URL_RECEIVED != connection->state)
+      if (MHD_CONNECTION_REQ_LINE_RECEIVED != connection->state)
         continue;
       if (NULL == line)
       {
diff --git a/src/microhttpd/internal.c b/src/microhttpd/internal.c
@@ -43,8 +43,8 @@ MHD_state_to_string (enum MHD_CONNECTION_STATE state)
     return "connection init";
   case MHD_CONNECTION_REQ_LINE_RECEIVING:
     return "receiving request line";
-  case MHD_CONNECTION_URL_RECEIVED:
-    return "connection url received";
+  case MHD_CONNECTION_REQ_LINE_RECEIVED:
+    return "request line received";
   case MHD_CONNECTION_HEADER_PART_RECEIVED:
     return "header partially received";
   case MHD_CONNECTION_HEADERS_RECEIVED:
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
@@ -624,12 +624,12 @@ enum MHD_CONNECTION_STATE
   /**
    * We got the URL (and request type and version).  Wait for a header line.
    */
-  MHD_CONNECTION_URL_RECEIVED = MHD_CONNECTION_REQ_LINE_RECEIVING + 1,
+  MHD_CONNECTION_REQ_LINE_RECEIVED = MHD_CONNECTION_REQ_LINE_RECEIVING + 1,
 
   /**
    * We got part of a multi-line request header.  Wait for the rest.
    */
-  MHD_CONNECTION_HEADER_PART_RECEIVED = MHD_CONNECTION_URL_RECEIVED + 1,
+  MHD_CONNECTION_HEADER_PART_RECEIVED = MHD_CONNECTION_REQ_LINE_RECEIVED + 1,
 
   /**
    * We got the request headers.  Process them.