[Groonga-commit] groonga/groonga at 71fefef [master] http: use recv() instead of read()

Back to archive index

Kouhei Sutou null+****@clear*****
Sat Jun 7 14:44:11 JST 2014


Kouhei Sutou	2014-06-07 14:44:11 +0900 (Sat, 07 Jun 2014)

  New Revision: 71fefeff95b7ca841eb91256728263d1d4463746
  https://github.com/groonga/groonga/commit/71fefeff95b7ca841eb91256728263d1d4463746

  Message:
    http: use recv() instead of read()
    
    Because com.c uses recv() not read().

  Modified files:
    src/groonga.c

  Modified: src/groonga.c (+7 -6)
===================================================================
--- src/groonga.c    2014-06-07 14:42:26 +0900 (bca1473)
+++ src/groonga.c    2014-06-07 14:44:11 +0900 (089ffb9)
@@ -974,7 +974,6 @@ do_htreq_post(grn_ctx *ctx, grn_msg *msg)
     GRN_TEXT_INIT(&line_buffer, 0);
     while (read_content_length < header.content_length) {
 #define POST_BUFFER_SIZE 8192
-      ssize_t read_length;
       grn_rc rc;
       char buffer[POST_BUFFER_SIZE];
       const char *buffer_start, *buffer_current, *buffer_end;
@@ -984,16 +983,18 @@ do_htreq_post(grn_ctx *ctx, grn_msg *msg)
         buffer_end = end;
         header.body_start = NULL;
       } else {
-        read_length = read(fd, buffer, POST_BUFFER_SIZE);
-        if (read_length == 0) {
+        ssize_t recv_length;
+        int recv_flags = 0;
+        recv_length = recv(fd, buffer, POST_BUFFER_SIZE, recv_flags);
+        if (recv_length == 0) {
           break;
         }
-        if (read_length == -1) {
-          SERR("read");
+        if (recv_length == -1) {
+          SERR("recv");
           break;
         }
         buffer_start = buffer;
-        buffer_end = buffer_start + read_length;
+        buffer_end = buffer_start + recv_length;
       }
       read_content_length += buffer_end - buffer_start;
 
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index