Author: jim
Date: Wed May 6 12:54:17 2009
New Revision: 772190
URL: http://svn.apache.org/viewvc?rev=772190&view=rev
Log:
Use canonical testing
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c?rev=772190&r1=772189&r2=772190&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c Wed May 6 12:54:17 2009
@@ -60,12 +60,12 @@
apr_interval_time_t t;
rv = apr_os_sock_get(&rawsock, sock);
- if (rv) {
+ if (rv != APR_SUCCESS) {
return rv;
}
rv = apr_socket_timeout_get(sock, &t);
- if (rv) {
+ if (rv != APR_SUCCESS) {
return rv;
}
@@ -99,7 +99,7 @@
rv = apr_socket_create(&s, AF_UNIX, SOCK_STREAM, 0, p);
- if (rv) {
+ if (rv != APR_SUCCESS) {
return rv;
}
@@ -107,7 +107,7 @@
apr_cpystrn(sa.sun_path, path, sizeof(sa.sun_path));
rv = socket_connect_un(s, &sa);
- if (rv) {
+ if (rv != APR_SUCCESS) {
return rv;
}
@@ -130,12 +130,12 @@
char b = '\0';
rv = apr_os_sock_get(&rawsock, outbound);
- if (rv) {
+ if (rv != APR_SUCCESS) {
return rv;
}
rv = apr_os_sock_get(&srawsock, s);
- if (rv) {
+ if (rv != APR_SUCCESS) {
return rv;
}
@@ -185,7 +185,7 @@
rv = get_socket_from_path(r->pool, url, &sock);
- if (rv) {
+ if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"proxy: FD: Failed to connect to '%s'",
url);
@@ -216,7 +216,7 @@
clientsock = ap_get_module_config(r->connection->conn_config, &core_module);
rv = send_socket(r->pool, sock, clientsock);
- if (rv) {
+ if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"proxy: FD: send_socket failed:");
return HTTP_INTERNAL_SERVER_ERROR;
@@ -229,7 +229,7 @@
* the tcp connection to the client.
*/
rv = apr_socket_create(&dummy, APR_INET, SOCK_STREAM, APR_PROTO_TCP, r->connection->pool);
- if (rv) {
+ if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"proxy: FD: failed to create dummy socket");
return HTTP_INTERNAL_SERVER_ERROR;
|