log env variables #1221
Merged
log env variables #1221
Conversation
This file contains hidden or 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
kazuho
reviewed
Mar 13, 2017
lib/core/logconf.c
Outdated
| @@ -487,6 +496,13 @@ char *h2o_log_request(h2o_logconf_t *logconf, h2o_req_t *req, size_t *len, char | |||
| RESERVE(sizeof(H2O_UINT16_LONGEST_STR) - 1); | |||
| pos = append_port(pos, req->conn->callbacks->get_peername, req->conn, nullexpr); | |||
| break; | |||
| case ELEMENT_TYPE_ENV_VAR: /* %{..}e */ { | |||
| h2o_iovec_t *env_var = h2o_req_getenv(req, element->data.name.base, element->data.name.len, 0); | |||
| if (env_var == NULL || env_var->len < 1) | |||
There was a problem hiding this comment.
Shouldn't we emit an zero-length string if len is zero? Some applications may use the existence of the environment variable as a sign of something, and in such case it is desirable to be able to distinguish between NULL and a zero-length string.
There was a problem hiding this comment.
uh, @kazuho thanks for the catch. fixed it.
kazuho
reviewed
Mar 13, 2017
lib/core/logconf.c
Outdated
| @@ -498,7 +498,7 @@ char *h2o_log_request(h2o_logconf_t *logconf, h2o_req_t *req, size_t *len, char | |||
| break; | |||
| case ELEMENT_TYPE_ENV_VAR: /* %{..}e */ { | |||
| h2o_iovec_t *env_var = h2o_req_getenv(req, element->data.name.base, element->data.name.len, 0); | |||
| if (env_var == NULL || env_var->len < 1) | |||
| if (env_var == NULL || env_var->len < 0) | |||
There was a problem hiding this comment.
Thank you for the change. Actually, you do not need to do env_var->len < 0, since a value of size_t is guaranteed to be non-negative.
|
Thank you for the changes! |
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.
unsafe_factoris needed