Hardening/2724 mhd to use poll #2751
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fgalan
reviewed
Dec 5, 2016
| @@ -0,0 +1 @@ | |||
| - Fix: libmicrohttpd now uses poll() and not select() (#2724) | |||
There was a problem hiding this comment.
Maybe epoll and #2166 should be mentionces here. In addition, explain the "functional" nature of the change. Suggestion:
- Fix: libmicrohttpd now uses poll()/epoll() and not select() so fds greater than 1024 can be used for incomming connections (#2724, #2166)
fgalan
reviewed
Dec 5, 2016
| // while in MHD 0.9.51, the name of the define has changed to MHD_USE_EPOLL. | ||
| // So, to support both names, we need a ifdef/else cpp directive here. | ||
| // | ||
| #ifdef MHD_USE_EPOLL |
There was a problem hiding this comment.
Looks smart, as this will work if we some day upgrade MHD. However, it wouldn't be a problem also to "stick" to 0.9.48 now and change the code in the future :)
NTC
fgalan
reviewed
Dec 5, 2016
| @@ -379,7 +369,7 @@ PaArgument paArgs[] = | |||
| { "-subCacheIval", &subCacheInterval, "SUBCACHE_IVAL", PaInt, PaOpt, 60, 0, 3600, SUB_CACHE_IVAL_DESC }, | |||
| { "-noCache", &noCache, "NOCACHE", PaBool, PaOpt, false, false, true, NO_CACHE }, | |||
| { "-connectionMemory", &connectionMemory, "CONN_MEMORY", PaUInt, PaOpt, 64, 0, 1024, CONN_MEMORY_DESC }, | |||
| { "-maxConnections", &maxConnections, "MAX_CONN", PaUInt, PaOpt, FD_SETSIZE - 4, 0, FD_SETSIZE - 4, MAX_CONN_DESC }, | |||
| { "-maxConnections", &maxConnections, "MAX_CONN", PaUInt, PaOpt, 1020, 0, PaNL, MAX_CONN_DESC }, | |||
There was a problem hiding this comment.
Maybe a comment about that 1020 comes from old implementation based in select and it has been kept for legacy reasons could be useful (in the future, we could easily forget where this magic 1020 came from).
|
LGTM |
1 similar comment
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Made MHD use
polland notselect.Also, changed a little bit how serverMode was set - made it cleaner.
Fixes #2724.