httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server protocol.c
Date Sun, 17 Mar 2002 23:18:11 GMT
wrowe       02/03/17 15:18:11

  Modified:    server   protocol.c
  Log:
    Seems like this is the end of the compiler emits on Win32, once again.
  
  Revision  Changes    Path
  1.93      +5 -2      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- protocol.c	13 Mar 2002 20:48:00 -0000	1.92
  +++ protocol.c	17 Mar 2002 23:18:10 -0000	1.93
  @@ -677,8 +677,9 @@
       /* ap_getline returns (size of max buffer - 1) if it fills up the
        * buffer before finding the end-of-line.  This is only going to
        * happen if it exceeds the configured limit for a request-line.
  +     * The cast is safe, limit_req_line cannot be negative
        */
  -    if (len > r->server->limit_req_line) {
  +    if (len > (apr_size_t)r->server->limit_req_line) {
           r->status    = HTTP_REQUEST_URI_TOO_LARGE;
           r->proto_num = HTTP_VERSION(1,0);
           r->protocol  = apr_pstrdup(r->pool, "HTTP/1.0");
  @@ -739,9 +740,11 @@
           /* ap_rgetline returns APR_ENOSPC if it fills up the buffer before
            * finding the end-of-line.  This is only going to happen if it
            * exceeds the configured limit for a field size.
  +         * The cast is safe, limit_req_fieldsize cannot be negative
            */
           if (rv == APR_ENOSPC
  -            || (rv == APR_SUCCESS && len > r->server->limit_req_fieldsize))
{
  +            || (rv == APR_SUCCESS 
  +                && len > (apr_size_t)r->server->limit_req_fieldsize))
{
               r->status = HTTP_BAD_REQUEST;
               apr_table_setn(r->notes, "error-notes",
                              apr_pstrcat(r->pool,
  
  
  

Mime
View raw message