cvs commit: apache-1.3/src/main http_config.c http_protocol.c

[fielding]

fielding    98/09/25 15:45:01

  Modified:    src/main http_config.c http_protocol.c
  Log:
  Fix warnings and add error-notes to HTTP_REQUEST_URI_TOO_LARGE.
  
  Revision  Changes    Path
  1.131     +4 -1      apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- http_config.c     1998/09/25 15:42:12     1.130
  +++ http_config.c     1998/09/25 22:45:00     1.131
  @@ -1229,7 +1229,10 @@
        filename = ap_make_full_path(r->pool, d, w);
        f = ap_pcfg_openfile(r->pool, filename);
       }
  -    if (f) {
  +    if (!access_name[0]) {
  +     dc = NULL;
  +    }
  +    else if (f) {
        dc = ap_create_per_dir_config(r->pool);
   
        parms.config_file = f;
  
  
  
  1.241     +7 -4      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.240
  retrieving revision 1.241
  diff -u -r1.240 -r1.241
  --- http_protocol.c   1998/09/25 12:27:05     1.240
  +++ http_protocol.c   1998/09/25 22:45:00     1.241
  @@ -2158,7 +2158,7 @@
        case BAD_REQUEST:
            ap_bputs("Your browser sent a request that\n", fd);
            ap_bputs("this server could not understand.<P>\n", fd);
  -         if (error_notes = ap_table_get(r->notes, "error-notes") != NULL) {
  +         if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
                ap_bvputs(fd, error_notes, "<P>\n", NULL);
            }
            break;
  @@ -2195,7 +2195,7 @@
        case LENGTH_REQUIRED:
            ap_bvputs(fd, "A request of the requested method ", r->method,
                      " requires a valid Content-length.<P>\n", NULL);
  -         if (error_notes = ap_table_get(r->notes, "error-notes") != NULL) {
  +         if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
                ap_bvputs(fd, error_notes, "<P>\n", NULL);
            }
            break;
  @@ -2238,7 +2238,10 @@
            break;
        case HTTP_REQUEST_URI_TOO_LARGE:
            ap_bputs("The requested URL's length exceeds the capacity\n", fd);
  -         ap_bputs("limit for this server.\n", fd);
  +         ap_bputs("limit for this server.<P>\n", fd);
  +         if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
  +             ap_bvputs(fd, error_notes, "<P>\n", NULL);
  +         }
            break;
        case HTTP_UNSUPPORTED_MEDIA_TYPE:
            ap_bputs("The supplied request data is not in a format\n", fd);
  @@ -2263,7 +2266,7 @@
            ap_bputs(" and inform them of the time the error occurred,\n", fd);
            ap_bputs("and anything you might have done that may have\n", fd);
            ap_bputs("caused the error.<P>\n", fd);
  -         if (error_notes = ap_table_get(r->notes, "error-notes") != NULL) {
  +         if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
                ap_bvputs(fd, error_notes, "<P>\n", NULL);
            }
            break;