diff options
| author | Christophe Jaillet <jailletc36@apache.org> | 2014-10-22 07:12:51 +0200 |
|---|---|---|
| committer | Christophe Jaillet <jailletc36@apache.org> | 2014-10-22 07:12:51 +0200 |
| commit | 5d8dd1fc919ce52b817ff1014015809f4ae50178 (patch) | |
| tree | c41ad8e2782fe4c9a5d77670f265add7687a5464 /server/apreq_util.c | |
| parent | Fix indent. (diff) | |
| download | apache2-5d8dd1fc919ce52b817ff1014015809f4ae50178.tar.xz apache2-5d8dd1fc919ce52b817ff1014015809f4ae50178.zip | |
tab vs space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1633525 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/apreq_util.c')
| -rw-r--r-- | server/apreq_util.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/server/apreq_util.c b/server/apreq_util.c index 7f196a7607..f2527cfc34 100644 --- a/server/apreq_util.c +++ b/server/apreq_util.c @@ -98,13 +98,13 @@ APREQ_DECLARE(apr_ssize_t ) apreq_index(const char* hay, apr_size_t hlen, const char *begin = hay; while ( (hay = memchr(hay, ndl[0], len)) ) { - len = end - hay; + len = end - hay; - /* done if matches up to capacity of buffer */ - if ( memcmp(hay, ndl, MIN(nlen, len)) == 0 ) { + /* done if matches up to capacity of buffer */ + if ( memcmp(hay, ndl, MIN(nlen, len)) == 0 ) { if (type == APREQ_MATCH_FULL && len < nlen) hay = NULL; /* insufficient room for match */ - break; + break; } --len; ++hay; @@ -365,11 +365,10 @@ static apr_status_t url_decode(char *dest, apr_size_t *dlen, break; case '%': - if (s + 2 < end && apr_isxdigit(s[1]) && apr_isxdigit(s[2])) - { + if (s + 2 < end && apr_isxdigit(s[1]) && apr_isxdigit(s[2])) { *d = hex2_to_char(s + 1); s += 2; - } + } else if (s + 5 < end && (s[1] == 'u' || s[1] == 'U') && apr_isxdigit(s[2]) && apr_isxdigit(s[3]) && apr_isxdigit(s[4]) && apr_isxdigit(s[5])) @@ -390,7 +389,7 @@ static apr_status_t url_decode(char *dest, apr_size_t *dlen, } s += 5; } - else { + else { *dlen = d - start; *slen = s - src; if (s + 5 < end @@ -405,7 +404,7 @@ static apr_status_t url_decode(char *dest, apr_size_t *dlen, memmove(d, s, end - s); d[end - s] = 0; return APR_INCOMPLETE; - } + } break; default: |