On the 2.4.x branch:

mod_http2: removing debug logs leftover in previous commit

* modules/http2/h2_bucket_beam.c
 removed log warnings from debug session

Modified:
   httpd/httpd/trunk/modules/http2/h2_bucket_beam.c

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1775945 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http2/h2_bucket_beam.c b/modules/http2/h2_bucket_beam.c
index 6d0b04920db7dd816bc0fa9909bab918082abce3..add3065c9756a4da75ab21b38d1cd573e1cc6db3 100644 (file)
--- a/modules/http2/h2_bucket_beam.c
+++ b/modules/http2/h2_bucket_beam.c
@@ -635,8 +635,6 @@ void h2_beam_abort(h2_bucket_beam *beam)
             r_purge_sent(beam);
             h2_blist_cleanup(&beam->send_list);
             report_consumption(beam, 0);
-            ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, beam->send_pool, 
-                          "h2_beam(%d-%s): aborted", beam->id, beam->tag);
         }
         if (beam->m_cond) {
             apr_thread_cond_broadcast(beam->m_cond);
@@ -837,8 +835,6 @@ apr_status_t h2_beam_send(h2_bucket_beam *beam,
 
     /* Called from the red thread to add buckets to the beam */
     if (enter_yellow(beam, &bl) == APR_SUCCESS) {
-        ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, beam->send_pool, 
-                      "h2_beam(%d-%s): send", beam->id, beam->tag);
         r_purge_sent(beam);
         if (red_brigade && !beam->send_pool) {
             beam_set_send_pool(beam, red_brigade->p);
@@ -880,8 +876,6 @@ apr_status_t h2_beam_receive(h2_bucket_beam *beam,
     /* Called from the green thread to take buckets from the beam */
     if (enter_yellow(beam, &bl) == APR_SUCCESS) {
 transfer:
-        ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, beam->send_pool, 
-                      "h2_beam(%d-%s): receive", beam->id, beam->tag);
         if (beam->aborted) {
             if (beam->recv_buffer && !APR_BRIGADE_EMPTY(beam->recv_buffer)) {
                 apr_brigade_cleanup(beam->recv_buffer);

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 7ff9a0c84fe72f445158d0d6b889f8b369aba4df..b29a1160283968d0aa6c84b0b6f2b29d66dbcb8f 100644 (file)
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -26,7 +26,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.8.4"
+#define MOD_HTTP2_VERSION "1.8.5"
 
 /**
  * @macro
@@ -34,7 +34,7 @@
  * release. This is a 24 bit number with 8 bits for major number, 8 bits
  * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
  */
-#define MOD_HTTP2_VERSION_NUM 0x010804
+#define MOD_HTTP2_VERSION_NUM 0x010805
 
 
 #endif /* mod_h2_h2_version_h */