httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@hyperreal.org
Subject cvs commit: apache-1.3/src/os/win32 mod_isapi.c
Date Fri, 08 Jan 1999 17:54:44 GMT
fielding    99/01/08 09:54:44

  Modified:    src      CHANGES
               src/include ap_compat.h httpd.h util_script.h
               src/main http_protocol.c http_request.c
               src/modules/standard mod_asis.c
               src/os/win32 mod_isapi.c
  Log:
  Renamed macros status_drops_connection to ap_status_drops_connection
  and vestigial scan_script_header to ap_scan_script_header_err,
  mostly for aesthetic reasons.
  
  Reviewed by:	Ralf S. Engelschall, Dean Gaudet
  
  Revision  Changes    Path
  1.1207    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1206
  retrieving revision 1.1207
  diff -u -r1.1206 -r1.1207
  --- CHANGES	1999/01/08 08:48:44	1.1206
  +++ CHANGES	1999/01/08 17:54:37	1.1207
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.4
   
  +  *) Renamed macros status_drops_connection to ap_status_drops_connection
  +     and vestigial scan_script_header to ap_scan_script_header_err,
  +     mostly for aesthetic reasons. [Roy Fielding]
  +
     *) The query switch "httpd -S" didn't exit after showing the
        vhost settings. That was inconsistent with the other query functions.
        [Martin Kraemer]
  
  
  
  1.15      +2 -0      apache-1.3/src/include/ap_compat.h
  
  Index: ap_compat.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/ap_compat.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ap_compat.h	1998/07/13 11:32:33	1.14
  +++ ap_compat.h	1999/01/08 17:54:39	1.15
  @@ -325,6 +325,7 @@
   #define rvputs                         ap_rvputs
   #define rwrite                         ap_rwrite
   #define satisfies                      ap_satisfies
  +#define scan_script_header(a1,a2)      ap_scan_script_header_err(a1,a2,NULL)
   #define scan_script_header_err         ap_scan_script_header_err
   #define scan_script_header_err_buff    ap_scan_script_header_err_buff
   #define scoreboard_fname               ap_scoreboard_fname
  @@ -372,6 +373,7 @@
   #define standalone                     ap_standalone
   #define start_restart                  ap_start_restart
   #define start_shutdown                 ap_start_shutdown
  +#define status_drops_connection        ap_status_drops_connection
   #define str_tolower                    ap_str_tolower
   #define strcasecmp_match               ap_strcasecmp_match
   #define strcmp_match                   ap_strcmp_match
  
  
  
  1.259     +2 -1      apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.258
  retrieving revision 1.259
  diff -u -r1.258 -r1.259
  --- httpd.h	1999/01/05 08:17:27	1.258
  +++ httpd.h	1999/01/08 17:54:39	1.259
  @@ -529,7 +529,8 @@
   #define ap_is_HTTP_CLIENT_ERROR(x) (((x) >= 400)&&((x) < 500))
   #define ap_is_HTTP_SERVER_ERROR(x) (((x) >= 500)&&((x) < 600))
   
  -#define status_drops_connection(x) (((x) == HTTP_BAD_REQUEST)           || \
  +#define ap_status_drops_connection(x) \
  +                                   (((x) == HTTP_BAD_REQUEST)           || \
                                       ((x) == HTTP_REQUEST_TIME_OUT)      || \
                                       ((x) == HTTP_LENGTH_REQUIRED)       || \
                                       ((x) == HTTP_REQUEST_ENTITY_TOO_LARGE) || \
  
  
  
  1.36      +0 -1      apache-1.3/src/include/util_script.h
  
  Index: util_script.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/util_script.h,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- util_script.h	1999/01/01 19:04:42	1.35
  +++ util_script.h	1999/01/08 17:54:40	1.36
  @@ -74,7 +74,6 @@
   API_EXPORT(int) ap_find_path_info(const char *uri, const char *path_info);
   API_EXPORT(void) ap_add_cgi_vars(request_rec *r);
   API_EXPORT(void) ap_add_common_vars(request_rec *r);
  -#define scan_script_header(a1,a2) ap_scan_script_header_err(a1,a2,NULL)
   API_EXPORT(int) ap_scan_script_header_err(request_rec *r, FILE *f, char *buffer);
   API_EXPORT(int) ap_scan_script_header_err_buff(request_rec *r, BUFF *f,
                                                  char *buffer);
  
  
  
  1.253     +1 -1      apache-1.3/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
  retrieving revision 1.252
  retrieving revision 1.253
  diff -u -r1.252 -r1.253
  --- http_protocol.c	1999/01/01 19:04:49	1.252
  +++ http_protocol.c	1999/01/08 17:54:41	1.253
  @@ -305,7 +305,7 @@
           (r->server->keep_alive_timeout > 0) &&
           ((r->server->keep_alive_max == 0) ||
            (r->server->keep_alive_max > r->connection->keepalives)) &&
  -        !status_drops_connection(r->status) &&
  +        !ap_status_drops_connection(r->status) &&
           !wimpy &&
           !ap_find_token(r->pool, conn, "close") &&
           (!ap_table_get(r->subprocess_env, "nokeepalive") ||
  
  
  
  1.142     +1 -1      apache-1.3/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- http_request.c	1999/01/05 08:17:29	1.141
  +++ http_request.c	1999/01/08 17:54:42	1.142
  @@ -978,7 +978,7 @@
        * (if any) has been read.
        */
       if ((r->status != HTTP_NOT_MODIFIED) && (r->status != HTTP_NO_CONTENT)
  -        && !status_drops_connection(r->status)
  +        && !ap_status_drops_connection(r->status)
           && r->connection && (r->connection->keepalive != -1))
{
   
           (void) ap_discard_request_body(r);
  
  
  
  1.32      +1 -1      apache-1.3/src/modules/standard/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_asis.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mod_asis.c	1999/01/01 19:05:06	1.31
  +++ mod_asis.c	1999/01/08 17:54:43	1.32
  @@ -85,7 +85,7 @@
   	return FORBIDDEN;
       }
   
  -    scan_script_header(r, f);
  +    ap_scan_script_header_err(r, f, NULL);
       location = ap_table_get(r->headers_out, "Location");
   
       if (location && location[0] == '/' &&
  
  
  
  1.17      +1 -1      apache-1.3/src/os/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_isapi.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_isapi.c	1999/01/01 19:05:31	1.16
  +++ mod_isapi.c	1999/01/08 17:54:43	1.17
  @@ -463,7 +463,7 @@
   	    while (*value && ap_isspace(*value)) ++value;
   
   	    /* Check all the special-case headers. Similar to what
  -	     * scan_script_header() does (see that function for
  +	     * ap_scan_script_header_err() does (see that function for
   	     * more detail)
   	     */
   
  
  
  

Mime
View raw message