Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 20137 invoked from network); 31 Jul 2006 12:40:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 31 Jul 2006 12:40:24 -0000 Received: (qmail 29961 invoked by uid 500); 31 Jul 2006 12:40:23 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 29910 invoked by uid 500); 31 Jul 2006 12:40:23 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 29899 invoked by uid 99); 31 Jul 2006 12:40:23 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jul 2006 05:40:23 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jul 2006 05:40:22 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9874B1A981D; Mon, 31 Jul 2006 05:40:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r427103 - /httpd/httpd/branches/httpd-proxy-scoreboard/modules/proxy/health_checker_util.c Date: Mon, 31 Jul 2006 12:40:02 -0000 To: cvs@httpd.apache.org From: jfclere@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060731124002.9874B1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jfclere Date: Mon Jul 31 05:40:01 2006 New Revision: 427103 URL: http://svn.apache.org/viewvc?rev=427103&view=rev Log: AJP needs to be register at IANA before beeing in apr_uri_port_of_scheme(). Modified: httpd/httpd/branches/httpd-proxy-scoreboard/modules/proxy/health_checker_util.c Modified: httpd/httpd/branches/httpd-proxy-scoreboard/modules/proxy/health_checker_util.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/httpd-proxy-scoreboard/modules/proxy/health_checker_util.c?rev=427103&r1=427102&r2=427103&view=diff ============================================================================== --- httpd/httpd/branches/httpd-proxy-scoreboard/modules/proxy/health_checker_util.c (original) +++ httpd/httpd/branches/httpd-proxy-scoreboard/modules/proxy/health_checker_util.c Mon Jul 31 05:40:01 2006 @@ -71,9 +71,14 @@ apr_sockaddr_t *epsv_addr; apr_status_t rv; - /* Note that AJP requires a new apr-util (29-07-2006) */ - if (!port) - port = (int) apr_uri_port_of_scheme(scheme); + /* AJP port will not be support by apr-util until AJP get registered at IANA */ + if (!port) { + if (strcmp(scheme, "ajp") == 0) + port = 8009; + else + port = (int) apr_uri_port_of_scheme(scheme); + } + rv = apr_socket_create(&newsock, APR_INET, SOCK_STREAM, APR_PROTO_TCP, pool); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,