Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor improvements and fixes for typos #21

Merged
merged 9 commits into from Jul 19, 2011
Merged

Minor improvements and fixes for typos #21

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3357c25
fix: Missing check for invalid ids in reportuploads_handler
BenBE Jan 30, 2011
501468e
Merge branch 'mpokrywka/master'
BenBE Feb 4, 2011
a033210
Implement an ETA feature for uploads & a feature to tell when it acut…
BenBE Feb 4, 2011
74009ec
Updated README
BenBE Feb 4, 2011
5a63db8
fix: Typo in variable assignment
BenBE Feb 4, 2011
446c296
fix: Fixed typo reported by Jérémy Bobbio
BenBE Feb 10, 2011
4a1e131
add: Report non-POST requests when extensive debugging is enabled.
BenBE Feb 11, 2011
ae7b9f5
chg: Only query server configuration when necessary (cleanup of logs …
BenBE Feb 11, 2011
dff9a03
mrg: Merged changes from drogus/master
BenBE Jul 19, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions mod_upload_progress.c
View file
Open in desktop
Expand Up @@ -421,6 +421,10 @@ static const char *get_json_callback_param(request_rec *r, int *param_error) {
return NULL;
}

static inline int check_node(upload_progress_node_t *node, const char *key) {
return ((node) && (strncasecmp(node->key, key, ARG_MAXLEN_PROGRESSID) == 0)) ? 1 : 0;
}

static upload_progress_node_t *find_node(server_rec *server, const char *key) {
/**/up_log(APLOG_MARK, APLOG_DEBUG, 0, server, "find_node()");

Expand All @@ -433,7 +437,7 @@ static upload_progress_node_t *find_node(server_rec *server, const char *key) {

for (i = 0; i < active; i++) {
node = &nodes[list[i]];
if (strncasecmp(node->key, key, ARG_MAXLEN_PROGRESSID) == 0)
if (check_node(node, key))
return node;
}
return NULL;
Expand Down Expand Up @@ -685,7 +689,7 @@ static int reportuploads_handler(request_rec *r)
* request in error: err_status >= NGX_HTTP_SPECIAL_RESPONSE
* request finished: done = true
* request not yet started but registered: length==0 && rest ==0
* reauest in progress: rest > 0
* request in progress: rest > 0
*/

if (!found) {
Expand Down