cvs commit: apache/src http_protocol.c

[Alexei Kosut]

akosut      96/08/06 17:46:52

  Modified:    src       http_protocol.c
  Log:
  Don't override an existing Connection: header.
  
  Submitted by: Roy T. Fielding
  
  Revision  Changes    Path
  1.34      +2 -2      apache/src/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_protocol.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -C3 -r1.33 -r1.34
  *** http_protocol.c   1996/08/07 00:43:07     1.33
  --- http_protocol.c   1996/08/07 00:46:51     1.34
  ***************
  *** 303,309 ****
    #endif
            sprintf(header, "timeout=%d, max=%d",
                    r->server->keep_alive_timeout, left);
  !         table_set (r->headers_out, "Connection", "Keep-Alive");
            table_set (r->headers_out, "Keep-Alive", pstrdup(r->pool, header));
    #ifdef FORHTTP11
        }
  --- 303,309 ----
    #endif
            sprintf(header, "timeout=%d, max=%d",
                    r->server->keep_alive_timeout, left);
  !         table_merge (r->headers_out, "Connection", "Keep-Alive");
            table_set (r->headers_out, "Keep-Alive", pstrdup(r->pool, header));
    #ifdef FORHTTP11
        }
  ***************
  *** 317,323 ****
         * as HTTP/1.0, but pass our request along with our HTTP/1.1 tag
         * to a HTTP/1.1 client. Better safe than sorry.
         */
  !     table_set (r->headers_out, "Connection", "close");
    
        return 0;
    }
  --- 317,323 ----
         * as HTTP/1.0, but pass our request along with our HTTP/1.1 tag
         * to a HTTP/1.1 client. Better safe than sorry.
         */
  !     table_merge (r->headers_out, "Connection", "close");
    
        return 0;
    }