diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-03-02 20:42:56 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-03-02 21:45:25 +0100 |
commit | 71a67ca95997fb2c3a90108a776f61fe1b95e68c (patch) | |
tree | 133397bb2199b93eedb95da8caab01873ca07f89 /src/lib/request_info.c | |
parent | 7f1dbb2aef40573861d9d19add648d1a327386f2 (diff) | |
download | libmicrohttpd-71a67ca95997fb2c3a90108a776f61fe1b95e68c.tar.gz libmicrohttpd-71a67ca95997fb2c3a90108a776f61fe1b95e68c.zip |
remove dead IN_CLEANUP state, revert previous patch that called completed callback from wrong thread
Diffstat (limited to 'src/lib/request_info.c')
-rw-r--r-- | src/lib/request_info.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/request_info.c b/src/lib/request_info.c index a7342e0a..5f481d98 100644 --- a/src/lib/request_info.c +++ b/src/lib/request_info.c | |||
@@ -48,7 +48,7 @@ MHD_request_get_information_sz (struct MHD_Request *request, | |||
48 | { | 48 | { |
49 | #define CHECK_SIZE(type) if (sizeof(type) < return_value_size) \ | 49 | #define CHECK_SIZE(type) if (sizeof(type) < return_value_size) \ |
50 | return MHD_NO | 50 | return MHD_NO |
51 | 51 | ||
52 | switch (info_type) | 52 | switch (info_type) |
53 | { | 53 | { |
54 | case MHD_REQUEST_INFORMATION_CONNECTION: | 54 | case MHD_REQUEST_INFORMATION_CONNECTION: |
@@ -70,8 +70,7 @@ MHD_request_get_information_sz (struct MHD_Request *request, | |||
70 | case MHD_REQUEST_INFORMATION_HEADER_SIZE: | 70 | case MHD_REQUEST_INFORMATION_HEADER_SIZE: |
71 | CHECK_SIZE (size_t); | 71 | CHECK_SIZE (size_t); |
72 | if ( (MHD_REQUEST_HEADERS_RECEIVED > request->state) || | 72 | if ( (MHD_REQUEST_HEADERS_RECEIVED > request->state) || |
73 | (MHD_REQUEST_CLOSED == request->state) || | 73 | (MHD_REQUEST_CLOSED == request->state) ) |
74 | (MHD_REQUEST_IN_CLEANUP == request->state) ) | ||
75 | return MHD_NO; /* invalid, too early! */ | 74 | return MHD_NO; /* invalid, too early! */ |
76 | return_value->header_size = request->header_size; | 75 | return_value->header_size = request->header_size; |
77 | return MHD_YES; | 76 | return MHD_YES; |
@@ -79,7 +78,7 @@ MHD_request_get_information_sz (struct MHD_Request *request, | |||
79 | default: | 78 | default: |
80 | return MHD_NO; | 79 | return MHD_NO; |
81 | } | 80 | } |
82 | 81 | ||
83 | #undef CHECK_SIZE | 82 | #undef CHECK_SIZE |
84 | } | 83 | } |
85 | 84 | ||