Restoring authorship annotation for <mcheshkov@yandex-team.ru>. Commit 1 of 2.

8 files changed, 129 insertions, 129 deletions

diff --git a/contrib/libs/nghttp2/AUTHORS b/contrib/libs/nghttp2/AUTHORS
index a7a9151b8e..22592d6444 100644
--- a/contrib/libs/nghttp2/AUTHORS
+++ b/contrib/libs/nghttp2/AUTHORS
@@ -49,16 +49,16 @@ Etienne Cimon
 Fabian Möller
 Fabian Wiesel
 Gabi Davar
-Gaël PORTAY
-Geoff Hill
+Gaël PORTAY 
+Geoff Hill 
 George Liu
 Gitai
 Google Inc.
 Hajime Fujita
-Jacky Tian
+Jacky Tian 
 Jacky_Yin
 Jacob Champion
-James M Snell
+James M Snell 
 Jan Kundrát
 Jan-E
 Janusz Dziemidowicz
@@ -75,7 +75,7 @@ Kenny Peng
 Kit Chan
 Kyle Schomp
 LazyHamster
-Leo Neat
+Leo Neat 
 Lorenz Nickel
 Lucas Pardue
 MATSUMOTO Ryosuke
diff --git a/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2.h b/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2.h
index 04321a652f..5497369254 100644
--- a/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2.h
+++ b/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2.h
@@ -229,13 +229,13 @@ typedef struct {
 #define NGHTTP2_CLIENT_MAGIC_LEN 24
 
 /**
- * @macro
- *
- * The default max number of settings per SETTINGS frame
- */
-#define NGHTTP2_DEFAULT_MAX_SETTINGS 32
-
-/**
+ * @macro 
+ * 
+ * The default max number of settings per SETTINGS frame 
+ */ 
+#define NGHTTP2_DEFAULT_MAX_SETTINGS 32 
+ 
+/** 
  * @enum
  *
  * Error codes used in this library.  The code range is [-999, -500],
@@ -406,11 +406,11 @@ typedef enum {
    */
   NGHTTP2_ERR_SETTINGS_EXPECTED = -536,
   /**
-   * When a local endpoint receives too many settings entries
-   * in a single SETTINGS frame.
-   */
-  NGHTTP2_ERR_TOO_MANY_SETTINGS = -537,
-  /**
+   * When a local endpoint receives too many settings entries 
+   * in a single SETTINGS frame. 
+   */ 
+  NGHTTP2_ERR_TOO_MANY_SETTINGS = -537, 
+  /** 
    * The errors < :enum:`nghttp2_error.NGHTTP2_ERR_FATAL` mean that
    * the library is under unexpected condition and processing was
    * terminated (e.g., out of memory).  If application receives this
@@ -2711,17 +2711,17 @@ NGHTTP2_EXTERN void nghttp2_option_set_max_outbound_ack(nghttp2_option *option,
 /**
  * @function
  *
- * This function sets the maximum number of SETTINGS entries per
- * SETTINGS frame that will be accepted. If more than those entries
- * are received, the peer is considered to be misbehaving and session
- * will be closed. The default value is 32.
- */
-NGHTTP2_EXTERN void nghttp2_option_set_max_settings(nghttp2_option *option,
-                                                    size_t val);
-
-/**
- * @function
- *
+ * This function sets the maximum number of SETTINGS entries per 
+ * SETTINGS frame that will be accepted. If more than those entries 
+ * are received, the peer is considered to be misbehaving and session 
+ * will be closed. The default value is 32. 
+ */ 
+NGHTTP2_EXTERN void nghttp2_option_set_max_settings(nghttp2_option *option, 
+                                                    size_t val); 
+ 
+/** 
+ * @function 
+ * 
  * Initializes |*session_ptr| for client use.  The all members of
  * |callbacks| are copied to |*session_ptr|.  Therefore |*session_ptr|
  * does not store |callbacks|.  The |user_data| is an arbitrary user
diff --git a/contrib/libs/nghttp2/lib/nghttp2_helper.c b/contrib/libs/nghttp2/lib/nghttp2_helper.c
index 588e269c34..b531d29829 100644
--- a/contrib/libs/nghttp2/lib/nghttp2_helper.c
+++ b/contrib/libs/nghttp2/lib/nghttp2_helper.c
@@ -334,8 +334,8 @@ const char *nghttp2_strerror(int error_code) {
   case NGHTTP2_ERR_FLOODED:
     return "Flooding was detected in this HTTP/2 session, and it must be "
            "closed";
-  case NGHTTP2_ERR_TOO_MANY_SETTINGS:
-    return "SETTINGS frame contained more than the maximum allowed entries";
+  case NGHTTP2_ERR_TOO_MANY_SETTINGS: 
+    return "SETTINGS frame contained more than the maximum allowed entries"; 
   default:
     return "Unknown error code";
   }
diff --git a/contrib/libs/nghttp2/lib/nghttp2_option.c b/contrib/libs/nghttp2/lib/nghttp2_option.c
index 34348e6606..358ef908d5 100644
--- a/contrib/libs/nghttp2/lib/nghttp2_option.c
+++ b/contrib/libs/nghttp2/lib/nghttp2_option.c
@@ -121,8 +121,8 @@ void nghttp2_option_set_max_outbound_ack(nghttp2_option *option, size_t val) {
   option->opt_set_mask |= NGHTTP2_OPT_MAX_OUTBOUND_ACK;
   option->max_outbound_ack = val;
 }
-
-void nghttp2_option_set_max_settings(nghttp2_option *option, size_t val) {
-  option->opt_set_mask |= NGHTTP2_OPT_MAX_SETTINGS;
-  option->max_settings = val;
-}
+ 
+void nghttp2_option_set_max_settings(nghttp2_option *option, size_t val) { 
+  option->opt_set_mask |= NGHTTP2_OPT_MAX_SETTINGS; 
+  option->max_settings = val; 
+} 
diff --git a/contrib/libs/nghttp2/lib/nghttp2_option.h b/contrib/libs/nghttp2/lib/nghttp2_option.h
index 939729fdcd..404eeb4319 100644
--- a/contrib/libs/nghttp2/lib/nghttp2_option.h
+++ b/contrib/libs/nghttp2/lib/nghttp2_option.h
@@ -67,7 +67,7 @@ typedef enum {
   NGHTTP2_OPT_MAX_DEFLATE_DYNAMIC_TABLE_SIZE = 1 << 9,
   NGHTTP2_OPT_NO_CLOSED_STREAMS = 1 << 10,
   NGHTTP2_OPT_MAX_OUTBOUND_ACK = 1 << 11,
-  NGHTTP2_OPT_MAX_SETTINGS = 1 << 12,
+  NGHTTP2_OPT_MAX_SETTINGS = 1 << 12, 
 } nghttp2_option_flag;
 
 /**
@@ -87,10 +87,10 @@ struct nghttp2_option {
    */
   size_t max_outbound_ack;
   /**
-   * NGHTTP2_OPT_MAX_SETTINGS
-   */
-  size_t max_settings;
-  /**
+   * NGHTTP2_OPT_MAX_SETTINGS 
+   */ 
+  size_t max_settings; 
+  /** 
    * Bitwise OR of nghttp2_option_flag to determine that which fields
    * are specified.
    */
diff --git a/contrib/libs/nghttp2/lib/nghttp2_session.c b/contrib/libs/nghttp2/lib/nghttp2_session.c
index 36f1179f72..d2d825dead 100644
--- a/contrib/libs/nghttp2/lib/nghttp2_session.c
+++ b/contrib/libs/nghttp2/lib/nghttp2_session.c
@@ -458,7 +458,7 @@ static int session_new(nghttp2_session **session_ptr,
 
   (*session_ptr)->max_send_header_block_length = NGHTTP2_MAX_HEADERSLEN;
   (*session_ptr)->max_outbound_ack = NGHTTP2_DEFAULT_MAX_OBQ_FLOOD_ITEM;
-  (*session_ptr)->max_settings = NGHTTP2_DEFAULT_MAX_SETTINGS;
+  (*session_ptr)->max_settings = NGHTTP2_DEFAULT_MAX_SETTINGS; 
 
   if (option) {
     if ((option->opt_set_mask & NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE) &&
@@ -522,11 +522,11 @@ static int session_new(nghttp2_session **session_ptr,
     if (option->opt_set_mask & NGHTTP2_OPT_MAX_OUTBOUND_ACK) {
       (*session_ptr)->max_outbound_ack = option->max_outbound_ack;
     }
-
-    if ((option->opt_set_mask & NGHTTP2_OPT_MAX_SETTINGS) &&
-        option->max_settings) {
-      (*session_ptr)->max_settings = option->max_settings;
-    }
+ 
+    if ((option->opt_set_mask & NGHTTP2_OPT_MAX_SETTINGS) && 
+        option->max_settings) { 
+      (*session_ptr)->max_settings = option->max_settings; 
+    } 
   }
 
   rv = nghttp2_hd_deflate_init2(&(*session_ptr)->hd_deflater,
@@ -2744,7 +2744,7 @@ static int session_after_frame_sent1(nghttp2_session *session) {
       if (session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) {
         rv = session_update_connection_consumed_size(session, 0);
       } else {
-        rv = nghttp2_session_update_recv_connection_window_size(session, 0);
+        rv = nghttp2_session_update_recv_connection_window_size(session, 0); 
       }
 
       if (nghttp2_is_fatal(rv)) {
@@ -2770,8 +2770,8 @@ static int session_after_frame_sent1(nghttp2_session *session) {
     if (session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) {
       rv = session_update_stream_consumed_size(session, stream, 0);
     } else {
-      rv =
-          nghttp2_session_update_recv_stream_window_size(session, stream, 0, 1);
+      rv = 
+          nghttp2_session_update_recv_stream_window_size(session, stream, 0, 1); 
     }
 
     if (nghttp2_is_fatal(rv)) {
@@ -5027,10 +5027,10 @@ static int adjust_recv_window_size(int32_t *recv_window_size_ptr, size_t delta,
   return 0;
 }
 
-int nghttp2_session_update_recv_stream_window_size(nghttp2_session *session,
-                                                   nghttp2_stream *stream,
-                                                   size_t delta_size,
-                                                   int send_window_update) {
+int nghttp2_session_update_recv_stream_window_size(nghttp2_session *session, 
+                                                   nghttp2_stream *stream, 
+                                                   size_t delta_size, 
+                                                   int send_window_update) { 
   int rv;
   rv = adjust_recv_window_size(&stream->recv_window_size, delta_size,
                                stream->local_window_size);
@@ -5059,8 +5059,8 @@ int nghttp2_session_update_recv_stream_window_size(nghttp2_session *session,
   return 0;
 }
 
-int nghttp2_session_update_recv_connection_window_size(nghttp2_session *session,
-                                                       size_t delta_size) {
+int nghttp2_session_update_recv_connection_window_size(nghttp2_session *session, 
+                                                       size_t delta_size) { 
   int rv;
   rv = adjust_recv_window_size(&session->recv_window_size, delta_size,
                                session->local_window_size);
@@ -5672,12 +5672,12 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
           break;
         }
 
-        /* Check the settings flood counter early to be safe */
-        if (session->obq_flood_counter_ >= session->max_outbound_ack &&
-            !(iframe->frame.hd.flags & NGHTTP2_FLAG_ACK)) {
-          return NGHTTP2_ERR_FLOODED;
-        }
-
+        /* Check the settings flood counter early to be safe */ 
+        if (session->obq_flood_counter_ >= session->max_outbound_ack && 
+            !(iframe->frame.hd.flags & NGHTTP2_FLAG_ACK)) { 
+          return NGHTTP2_ERR_FLOODED; 
+        } 
+ 
         iframe->state = NGHTTP2_IB_READ_SETTINGS;
 
         if (iframe->payloadleft) {
@@ -5688,16 +5688,16 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
           iframe->max_niv =
               iframe->frame.hd.length / NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH + 1;
 
-          if (iframe->max_niv - 1 > session->max_settings) {
-            rv = nghttp2_session_terminate_session_with_reason(
-                session, NGHTTP2_ENHANCE_YOUR_CALM,
-                "SETTINGS: too many setting entries");
-            if (nghttp2_is_fatal(rv)) {
-              return rv;
-            }
-            return (ssize_t)inlen;
-          }
-
+          if (iframe->max_niv - 1 > session->max_settings) { 
+            rv = nghttp2_session_terminate_session_with_reason( 
+                session, NGHTTP2_ENHANCE_YOUR_CALM, 
+                "SETTINGS: too many setting entries"); 
+            if (nghttp2_is_fatal(rv)) { 
+              return rv; 
+            } 
+            return (ssize_t)inlen; 
+          } 
+ 
           iframe->iv = nghttp2_mem_malloc(mem, sizeof(nghttp2_settings_entry) *
                                                    iframe->max_niv);
 
@@ -6465,7 +6465,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
       }
 
       /* Pad Length field is subject to flow control */
-      rv = nghttp2_session_update_recv_connection_window_size(session, readlen);
+      rv = nghttp2_session_update_recv_connection_window_size(session, readlen); 
       if (nghttp2_is_fatal(rv)) {
         return rv;
       }
@@ -6488,7 +6488,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
 
       stream = nghttp2_session_get_stream(session, iframe->frame.hd.stream_id);
       if (stream) {
-        rv = nghttp2_session_update_recv_stream_window_size(
+        rv = nghttp2_session_update_recv_stream_window_size( 
             session, stream, readlen,
             iframe->payloadleft ||
                 (iframe->frame.hd.flags & NGHTTP2_FLAG_END_STREAM) == 0);
@@ -6535,8 +6535,8 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
       if (readlen > 0) {
         ssize_t data_readlen;
 
-        rv = nghttp2_session_update_recv_connection_window_size(session,
-                                                                readlen);
+        rv = nghttp2_session_update_recv_connection_window_size(session, 
+                                                                readlen); 
         if (nghttp2_is_fatal(rv)) {
           return rv;
         }
@@ -6545,7 +6545,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
           return (ssize_t)inlen;
         }
 
-        rv = nghttp2_session_update_recv_stream_window_size(
+        rv = nghttp2_session_update_recv_stream_window_size( 
             session, stream, readlen,
             iframe->payloadleft ||
                 (iframe->frame.hd.flags & NGHTTP2_FLAG_END_STREAM) == 0);
@@ -6646,8 +6646,8 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
       if (readlen > 0) {
         /* Update connection-level flow control window for ignored
            DATA frame too */
-        rv = nghttp2_session_update_recv_connection_window_size(session,
-                                                                readlen);
+        rv = nghttp2_session_update_recv_connection_window_size(session, 
+                                                                readlen); 
         if (nghttp2_is_fatal(rv)) {
           return rv;
         }
@@ -7467,11 +7467,11 @@ static int nghttp2_session_upgrade_internal(nghttp2_session *session,
   if (settings_payloadlen % NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH) {
     return NGHTTP2_ERR_INVALID_ARGUMENT;
   }
-  /* SETTINGS frame contains too many settings */
+  /* SETTINGS frame contains too many settings */ 
   if (settings_payloadlen / NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH >
       session->max_settings) {
-    return NGHTTP2_ERR_TOO_MANY_SETTINGS;
-  }
+    return NGHTTP2_ERR_TOO_MANY_SETTINGS; 
+  } 
   rv = nghttp2_frame_unpack_settings_payload2(&iv, &niv, settings_payload,
                                               settings_payloadlen, mem);
   if (rv != 0) {
diff --git a/contrib/libs/nghttp2/lib/nghttp2_session.h b/contrib/libs/nghttp2/lib/nghttp2_session.h
index 07bfbb6c90..ddedc9f6fc 100644
--- a/contrib/libs/nghttp2/lib/nghttp2_session.h
+++ b/contrib/libs/nghttp2/lib/nghttp2_session.h
@@ -267,8 +267,8 @@ struct nghttp2_session {
   /* The maximum length of header block to send.  Calculated by the
      same way as nghttp2_hd_deflate_bound() does. */
   size_t max_send_header_block_length;
-  /* The maximum number of settings accepted per SETTINGS frame. */
-  size_t max_settings;
+  /* The maximum number of settings accepted per SETTINGS frame. */ 
+  size_t max_settings; 
   /* Next Stream ID. Made unsigned int to detect >= (1 << 31). */
   uint32_t next_stream_id;
   /* The last stream ID this session initiated.  For client session,
@@ -900,36 +900,36 @@ int nghttp2_session_terminate_session_with_reason(nghttp2_session *session,
                                                   uint32_t error_code,
                                                   const char *reason);
 
-/*
- * Accumulates received bytes |delta_size| for connection-level flow
- * control and decides whether to send WINDOW_UPDATE to the
- * connection.  If NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE is set,
- * WINDOW_UPDATE will not be sent.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_session_update_recv_connection_window_size(nghttp2_session *session,
-                                                       size_t delta_size);
-
-/*
- * Accumulates received bytes |delta_size| for stream-level flow
- * control and decides whether to send WINDOW_UPDATE to that stream.
- * If NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE is set, WINDOW_UPDATE will not
- * be sent.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_session_update_recv_stream_window_size(nghttp2_session *session,
-                                                   nghttp2_stream *stream,
-                                                   size_t delta_size,
-                                                   int send_window_update);
-
+/* 
+ * Accumulates received bytes |delta_size| for connection-level flow 
+ * control and decides whether to send WINDOW_UPDATE to the 
+ * connection.  If NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE is set, 
+ * WINDOW_UPDATE will not be sent. 
+ * 
+ * This function returns 0 if it succeeds, or one of the following 
+ * negative error codes: 
+ * 
+ * NGHTTP2_ERR_NOMEM 
+ *     Out of memory. 
+ */ 
+int nghttp2_session_update_recv_connection_window_size(nghttp2_session *session, 
+                                                       size_t delta_size); 
+ 
+/* 
+ * Accumulates received bytes |delta_size| for stream-level flow 
+ * control and decides whether to send WINDOW_UPDATE to that stream. 
+ * If NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE is set, WINDOW_UPDATE will not 
+ * be sent. 
+ * 
+ * This function returns 0 if it succeeds, or one of the following 
+ * negative error codes: 
+ * 
+ * NGHTTP2_ERR_NOMEM 
+ *     Out of memory. 
+ */ 
+int nghttp2_session_update_recv_stream_window_size(nghttp2_session *session, 
+                                                   nghttp2_stream *stream, 
+                                                   size_t delta_size, 
+                                                   int send_window_update); 
+ 
 #endif /* NGHTTP2_SESSION_H */
diff --git a/contrib/libs/nghttp2/lib/nghttp2_submit.c b/contrib/libs/nghttp2/lib/nghttp2_submit.c
index 744a49cf60..8b6e9f739f 100644
--- a/contrib/libs/nghttp2/lib/nghttp2_submit.c
+++ b/contrib/libs/nghttp2/lib/nghttp2_submit.c
@@ -450,13 +450,13 @@ int nghttp2_session_set_local_window_size(nghttp2_session *session,
     if (rv != 0) {
       return rv;
     }
-
-    if (window_size_increment > 0) {
-      return nghttp2_session_add_window_update(session, 0, stream_id,
-                                               window_size_increment);
-    }
-
-    return nghttp2_session_update_recv_connection_window_size(session, 0);
+ 
+    if (window_size_increment > 0) { 
+      return nghttp2_session_add_window_update(session, 0, stream_id, 
+                                               window_size_increment); 
+    } 
+ 
+    return nghttp2_session_update_recv_connection_window_size(session, 0); 
   } else {
     stream = nghttp2_session_get_stream(session, stream_id);
 
@@ -484,13 +484,13 @@ int nghttp2_session_set_local_window_size(nghttp2_session *session,
       return rv;
     }
 
-    if (window_size_increment > 0) {
-      return nghttp2_session_add_window_update(session, 0, stream_id,
-                                               window_size_increment);
-    }
-
-    return nghttp2_session_update_recv_stream_window_size(session, stream, 0,
-                                                          1);
+    if (window_size_increment > 0) { 
+      return nghttp2_session_add_window_update(session, 0, stream_id, 
+                                               window_size_increment); 
+    } 
+ 
+    return nghttp2_session_update_recv_stream_window_size(session, stream, 0, 
+                                                          1); 
   }
 
   return 0;