Commit 05442c3a authored by Randy Terbush's avatar Randy Terbush
Browse files

*) Fix a problem introduced by the directory index patch that 

     breaks CGI with PATH_INFO arguments.

  *) Remove const in storage type declaration for make_cookie().

Reviewed by: Marc Slemko, Sameer Parekh
Submitted by: Marc Slemko
CS: Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@77439 13f79535-47bb-0310-9956-ffa450edef68
parent 07ceee7f

RELEASE_1_1_X/src/CHANGES

+7 −0
Original line number Diff line number Diff line 
Changes with Apache 1.1.3:



  *) Fix a problem introduced by the directory index patch that

     breaks CGI with PATH_INFO arguments.



  *) Remove const in storage type declaration for make_cookie().



Changes with Apache 1.1.2:



  *) Fix a buffer overflow problem in mod_cookies. Without these

RELEASE_1_1_X/src/main/http_request.c

+5 −5
Original line number Diff line number Diff line
@@ -179,10 +179,10 @@ int get_path_info(request_rec *r) 
	    *cp = '\0';

	    return OK;

	}

#if defined(ENOENT)

	else if (errno == ENOENT) {

#if defined(ENOENT) && defined(ENOTDIR)

	else if (errno == ENOENT || errno == ENOTDIR) {

#else

  #error Your system apparently does not define ENOENT.

  #error Your system apparently does not define ENOENT || ENOTDIR.

  #error Removal of these lines opens a security hole if protecting

  #error from directory indexes with DirectoryIndex.

	else {
@@ -195,9 +195,9 @@ int get_path_info(request_rec *r) 
	    while (cp > path && cp[-1] == '/')

		--cp;

	} 

#if defined(ENOENT)

#if defined(ENOENT) && defined(ENOTDIR)

	else {

	    log_printf(r->server, "access to %s failed for client; unable to determine if index file exists (stat() returned unexpected error)", r->filename);

	    log_printf(r->server, "access to %s failed for client; unable to determine if index file exists (stat() returned unexpected error[%d])", r->filename, errno);

	    return FORBIDDEN;

	}

#endif

RELEASE_1_1_X/src/mod_cookies.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ void make_cookie(request_rec *r) 
    struct timeval tv;

    char new_cookie[1024];	/* blurgh */

    char *dot;

    const char *rname = pstrdup(r->pool, 

    char *rname = pstrdup(r->pool, 

				get_remote_host(r->connection, r->per_dir_config,

						REMOTE_NAME));