]> granicus.if.org Git - apache/commit
Use 'ap_request_has_body()' instead of duplicating its implemenation.
authorChristophe Jaillet <jailletc36@apache.org>
Tue, 20 Mar 2018 23:05:54 +0000 (23:05 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Tue, 20 Mar 2018 23:05:54 +0000 (23:05 +0000)
commite203d68bc4959a3421d2bb722d828fc579b5c8f6
tree0b09e60b91ca9700c427131df91ca35c93248369
parent6a0165dc37306f60e366e79b8dedeaa97a6d96b0
Use 'ap_request_has_body()' instead of duplicating its implemenation.

The logic in 'ap_request_has_body()' is:
    has_body = (!r->header_only
                && (r->kept_body
                    || apr_table_get(r->headers_in, "Transfer-Encoding")
                    || ( (cls = apr_table_get(r->headers_in, "Content-Length"))
                        && (apr_strtoff(&cl, cls, &estr, 10) == APR_SUCCESS)
                        && (!*estr)
                        && (cl > 0) )
                    )
                );
So the test is slighly different from the original code. (but this looks fine to me)

This also has the advantage to avoid a redundant call to 'apr_table_get()' and to improve readability.

While at it, move the test '!r->expecting_100' a few lines above because it is cheap.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827374 13f79535-47bb-0310-9956-ffa450edef68
modules/ssl/ssl_engine_kernel.c