www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Optimise the set flags in the mod_proxy structures.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1025699 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Graham Leggett
2010-10-20 19:47:00 +00:00
parent 84a346c5bb
commit a68e17cdb2
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/proxy/proxy_util.c
View File

@@ -1671,7 +1671,7 @@ PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **newsock,
}
/* Set a timeout on the socket */
if (conf->timeout_set == 1) {
if (conf->timeout_set) {
apr_socket_timeout_set(*newsock, conf->timeout);
}
else {
@@ -2501,10 +2501,10 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
if (worker->conn_timeout_set) {
apr_socket_timeout_set(newsock, worker->conn_timeout);
}
else if (worker->timeout_set == 1) {
else if (worker->timeout_set) {
apr_socket_timeout_set(newsock, worker->timeout);
}
else if (conf->timeout_set == 1) {
else if (conf->timeout_set) {
apr_socket_timeout_set(newsock, conf->timeout);
}
else {
@@ -2540,10 +2540,10 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
}
/* Set a timeout on the socket */
if (worker->timeout_set == 1) {
if (worker->timeout_set) {
apr_socket_timeout_set(newsock, worker->timeout);
}
else if (conf->timeout_set == 1) {
else if (conf->timeout_set) {
apr_socket_timeout_set(newsock, conf->timeout);
}
else {