Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F38D18C05 for ; Mon, 21 Mar 2016 10:22:52 +0000 (UTC) Received: (qmail 963 invoked by uid 500); 21 Mar 2016 10:22:52 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 889 invoked by uid 500); 21 Mar 2016 10:22:52 -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 880 invoked by uid 99); 21 Mar 2016 10:22:51 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2016 10:22:51 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 6A66EC0223 for ; Mon, 21 Mar 2016 10:22:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id PLaSEfv3teNw for ; Mon, 21 Mar 2016 10:22:50 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 8A8AA5F47A for ; Mon, 21 Mar 2016 10:22:49 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 8A136E00E9 for ; Mon, 21 Mar 2016 10:22:48 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 8AE063A0239 for ; Mon, 21 Mar 2016 10:22:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1735942 - in /httpd/httpd/trunk: docs/log-message-tags/next-number modules/http2/h2_proxy_session.c Date: Mon, 21 Mar 2016 10:22:48 -0000 To: cvs@httpd.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160321102248.8AE063A0239@svn01-us-west.apache.org> Author: ylavic Date: Mon Mar 21 10:22:48 2016 New Revision: 1735942 URL: http://svn.apache.org/viewvc?rev=1735942&view=rev Log: h2_proxy_session: fill in missing APLOGNO()s. Modified: httpd/httpd/trunk/docs/log-message-tags/next-number httpd/httpd/trunk/modules/http2/h2_proxy_session.c Modified: httpd/httpd/trunk/docs/log-message-tags/next-number URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1735942&r1=1735941&r2=1735942&view=diff ============================================================================== --- httpd/httpd/trunk/docs/log-message-tags/next-number (original) +++ httpd/httpd/trunk/docs/log-message-tags/next-number Mon Mar 21 10:22:48 2016 @@ -1 +1 @@ -3379 +3383 Modified: httpd/httpd/trunk/modules/http2/h2_proxy_session.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_proxy_session.c?rev=1735942&r1=1735941&r2=1735942&view=diff ============================================================================== --- httpd/httpd/trunk/modules/http2/h2_proxy_session.c (original) +++ httpd/httpd/trunk/modules/http2/h2_proxy_session.c Mon Mar 21 10:22:48 2016 @@ -723,7 +723,7 @@ static apr_status_t h2_proxy_session_rea } else { /* cannot block on timeout */ - ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, session->c, APLOGNO() + ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, session->c, APLOGNO(03379) "h2_proxy_session(%s): unable to get conn socket", session->id); return APR_ENOTIMPL; @@ -748,7 +748,7 @@ static apr_status_t h2_proxy_session_rea /* nop */ } else if (!APR_STATUS_IS_EAGAIN(status)) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c, APLOGNO() + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c, APLOGNO(03380) "h2_proxy_session(%s): read error", session->id); dispatch_event(session, H2_PROXYS_EV_CONN_ERROR, status, NULL); } @@ -764,7 +764,7 @@ apr_status_t h2_proxy_session_submit(h2_ status = open_stream(session, url, r, &stream); if (status == OK) { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(03381) "process stream(%d): %s %s%s, original: %s", stream->id, stream->req->method, stream->req->authority, stream->req->path, @@ -800,7 +800,7 @@ static apr_status_t check_suspended(h2_p } else if (status != APR_SUCCESS && !APR_STATUS_IS_EAGAIN(status)) { ap_log_cerror(APLOG_MARK, APLOG_WARNING, status, session->c, - APLOGNO() "h2_proxy_stream(%s-%d): check input", + APLOGNO(03382) "h2_proxy_stream(%s-%d): check input", session->id, stream_id); h2_iq_remove(session->suspended, stream_id); dispatch_event(session, H2_PROXYS_EV_STREAM_RESUMED, 0, NULL);