httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/modules/standard mod_asis.c mod_autoindex.c mod_log_config.c mod_negotiation.c
Date Thu, 14 Oct 1999 14:36:55 GMT
rbb         99/10/14 07:36:55

  Modified:    src/lib/apr/file_io/os2 open.c
               src/lib/apr/file_io/unix open.c
               src/lib/apr/file_io/win32 open.c
               src/lib/apr/include apr_file_io.h
               src/lib/apr/test ab_apr.c abc.c htdigest.c testfile.c
               src/main buff.c http_core.c http_log.c util.c
               src/modules/mpm/dexter acceptlock.c
               src/modules/mpm/mpmt_pthread acceptlock.c
               src/modules/mpm/prefork prefork.c
               src/modules/standard mod_asis.c mod_autoindex.c
                        mod_log_config.c mod_negotiation.c
  Log:
  I missed one function when swapping paramters.  This fixes it.  I think I
  have caught them all this time.  I really hope this is the final time I have
  to swap parameters.
  
  Revision  Changes    Path
  1.6       +1 -1      apache-2.0/src/lib/apr/file_io/os2/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/open.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- open.c	1999/10/12 06:14:40	1.5
  +++ open.c	1999/10/14 14:36:30	1.6
  @@ -70,7 +70,7 @@
   
   
   
  -ap_status_t ap_open(struct file_t **new, ap_context_t *cntxt, const char *fname, ap_int32_t
flag,  ap_fileperms_t perm)
  +ap_status_t ap_open(struct file_t **new, const char *fname, ap_int32_t flag,  ap_fileperms_t
perm, ap_context_t *cntxt)
   {
       int oflags = 0;
       int mflags = OPEN_FLAGS_FAIL_ON_ERROR|OPEN_SHARE_DENYNONE;
  
  
  
  1.16      +1 -1      apache-2.0/src/lib/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- open.c	1999/10/12 06:14:42	1.15
  +++ open.c	1999/10/14 14:36:30	1.16
  @@ -103,7 +103,7 @@
    * NOTE:  If mode is APR_OS_DEFAULT, the system open command will be 
    *        called without any mode parameters.
    */
  -ap_status_t ap_open(struct file_t **new, ap_context_t *cont, const char *fname, ap_int32_t
flag,  ap_fileperms_t perm)
  +ap_status_t ap_open(struct file_t **new, const char *fname, ap_int32_t flag,  ap_fileperms_t
perm, ap_context_t *cont)
   {
       int oflags = 0;
       mode_t mode = get_fileperms(perm);    
  
  
  
  1.6       +2 -2      apache-2.0/src/lib/apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- open.c	1999/10/13 01:38:13	1.5
  +++ open.c	1999/10/14 14:36:31	1.6
  @@ -77,8 +77,8 @@
       }
   }
   
  -ap_status_t ap_open(struct file_t **dafile, ap_context_t *cont, const char *fname, 
  -                    ap_int32_t flag, ap_fileperms_t perm)
  +ap_status_t ap_open(struct file_t **dafile, const char *fname, 
  +                    ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cont)
   {
       DWORD oflags = 0;
       DWORD createflags = 0;
  
  
  
  1.16      +1 -1      apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- apr_file_io.h	1999/10/13 21:09:10	1.15
  +++ apr_file_io.h	1999/10/14 14:36:33	1.16
  @@ -112,7 +112,7 @@
   typedef ap_int32_t               ap_fileperms_t;
   
   /*   Function definitions */
  -ap_status_t ap_open(ap_file_t **, ap_context_t *, const char *, ap_int32_t, ap_fileperms_t);
  +ap_status_t ap_open(ap_file_t **, const char *, ap_int32_t, ap_fileperms_t, ap_context_t
*);
   ap_status_t ap_close(ap_file_t *);
   ap_status_t ap_remove_file(char *, ap_context_t *);
   ap_status_t ap_eof(ap_file_t *);
  
  
  
  1.8       +1 -1      apache-2.0/src/lib/apr/test/ab_apr.c
  
  Index: ab_apr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/ab_apr.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ab_apr.c	1999/10/10 20:35:00	1.7
  +++ ab_apr.c	1999/10/14 14:36:34	1.8
  @@ -859,7 +859,7 @@
       ap_fileperms_t mode;
       ap_ssize_t length;
   
  -    if (ap_open(&postfd, cntxt, pfile, APR_READ, mode) != APR_SUCCESS) {
  +    if (ap_open(&postfd, pfile, APR_READ, mode, cntxt) != APR_SUCCESS) {
           printf("Invalid postfile name (%s)\n", pfile);
           return errno;
       }
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/test/abc.c
  
  Index: abc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/abc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- abc.c	1999/10/06 23:04:06	1.4
  +++ abc.c	1999/10/14 14:36:35	1.5
  @@ -13,7 +13,7 @@
   
       ap_create_context(&context, NULL); 
   
  -    ap_open(&fd, context, argv[1], APR_READ, -1);
  +    ap_open(&fd, argv[1], APR_READ, -1, context);
       
       while (!status) {
           status = ap_getc(&ch, fd);
  
  
  
  1.7       +3 -3      apache-2.0/src/lib/apr/test/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htdigest.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- htdigest.c	1999/10/06 23:04:06	1.6
  +++ htdigest.c	1999/10/14 14:36:35	1.7
  @@ -215,7 +215,7 @@
       if (argc == 5) {
   	if (strcmp(argv[1], "-c"))
   	    usage();
  -	if (ap_open(&tfp, cntxt, argv[2], APR_WRITE | APR_CREATE, -1) != APR_SUCCESS) {
  +	if (ap_open(&tfp, argv[2], APR_WRITE | APR_CREATE, -1, cntxt) != APR_SUCCESS) {
   	    fprintf(stderr, "Could not open passwd file %s for writing.\n",
   		    argv[2]);
   	    perror("ap_open");
  @@ -230,12 +230,12 @@
   	usage();
   
       tn = tmpnam(NULL);
  -    if (ap_open(&tfp, cntxt, tn, APR_WRITE | APR_CREATE, -1)!= APR_SUCCESS) {
  +    if (ap_open(&tfp, tn, APR_WRITE | APR_CREATE, -1, cntxt)!= APR_SUCCESS) {
   	fprintf(stderr, "Could not open temp file.\n");
   	exit(1);
       }
   
  -    if (ap_open(&f, cntxt, argv[1], APR_READ, -1) != APR_SUCCESS) {
  +    if (ap_open(&f, argv[1], APR_READ, -1, cntxt) != APR_SUCCESS) {
   	fprintf(stderr,
   		"Could not open passwd file %s for reading.\n", argv[1]);
   	fprintf(stderr, "Use -c option to create new one.\n");
  
  
  
  1.6       +5 -5      apache-2.0/src/lib/apr/test/testfile.c
  
  Index: testfile.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testfile.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- testfile.c	1999/10/06 23:04:07	1.5
  +++ testfile.c	1999/10/14 14:36:35	1.6
  @@ -89,7 +89,7 @@
       fprintf(stdout, "Testing file functions.\n");
   
       fprintf(stdout, "\tOpening file.......");
  -    if (ap_open(&thefile, context, filename, flag, APR_UREAD | APR_UWRITE | APR_GREAD)
!= APR_SUCCESS) {
  +    if (ap_open(&thefile, filename, flag, APR_UREAD | APR_UWRITE | APR_GREAD, context)
!= APR_SUCCESS) {
           perror("Didn't open file");
           exit(-1);
       }
  @@ -172,7 +172,7 @@
       }
       
       fprintf(stdout, "\tMaking sure it's gone.......");
  -    status = ap_open(&thefile, context, filename, APR_READ, APR_UREAD | APR_UWRITE
| APR_GREAD);
  +    status = ap_open(&thefile, filename, APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD,
context);
       if (status == APR_SUCCESS) {
           fprintf(stderr, "I could open the file for some reason?\n");
           exit(-1);
  @@ -193,7 +193,7 @@
       ap_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
       ap_status_t stat;
     
  -    stat = ap_open(&thefile, context, "testdel", flag, APR_UREAD | APR_UWRITE | APR_GREAD);
  +    stat = ap_open(&thefile, "testdel", flag, APR_UREAD | APR_UWRITE | APR_GREAD, context);
       if (stat != APR_SUCCESS) {
            return stat;
       }
  @@ -206,7 +206,7 @@
           return stat;
       }
   
  -    stat = ap_open(&thefile, context, "testdel", APR_READ, APR_UREAD | APR_UWRITE |
APR_GREAD);
  +    stat = ap_open(&thefile, "testdel", APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD,
context);
       if (stat == APR_SUCCESS) {
           return stat;
       }
  @@ -233,7 +233,7 @@
           fprintf(stdout, "OK\n");
       }
   
  -    if (ap_open(&file, context, "testdir/testfile", APR_READ | APR_WRITE | APR_CREATE,
APR_UREAD | APR_UWRITE | APR_UEXECUTE) != APR_SUCCESS) {;
  +    if (ap_open(&file, "testdir/testfile", APR_READ | APR_WRITE | APR_CREATE, APR_UREAD
| APR_UWRITE | APR_UEXECUTE, context) != APR_SUCCESS) {;
           return -1;
       }
   
  
  
  
  1.7       +1 -1      apache-2.0/src/main/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- buff.c	1999/10/04 16:37:49	1.6
  +++ buff.c	1999/10/14 14:36:37	1.7
  @@ -938,7 +938,7 @@
       BUFF *fb;
       ap_status_t rv;
       ap_file_t *file;
  -    rv = ap_open(&file, a, name, flg, 0);
  +    rv = ap_open(&file, name, flg, 0, a);
       if ((rv != APR_SUCCESS) || (file == NULL)) {
           return NULL;
       }
  
  
  
  1.18      +1 -1      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- http_core.c	1999/10/11 22:07:22	1.17
  +++ http_core.c	1999/10/14 14:36:37	1.18
  @@ -2515,7 +2515,7 @@
           return METHOD_NOT_ALLOWED;
       }
   	
  -    if (ap_open (&fd, r->pool, r->filename, APR_READ | APR_BINARY, 0) != APR_SUCCESS)
{
  +    if (ap_open (&fd, r->filename, APR_READ | APR_BINARY, 0, r->pool) != APR_SUCCESS)
{
           ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		     "file permissions deny server access: %s", r->filename);
           return FORBIDDEN;
  
  
  
  1.11      +3 -3      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- http_log.c	1999/10/11 17:52:28	1.10
  +++ http_log.c	1999/10/14 14:36:37	1.11
  @@ -260,8 +260,8 @@
       else {
   	fname = ap_server_root_relative(p, s->error_fname);
   	/*  Change to AP funcs. */
  -        if (ap_open(&s->error_log, p, fname, APR_BUFFERED | APR_APPEND | 
  -                    APR_READ | APR_WRITE, APR_OS_DEFAULT) != APR_SUCCESS) {
  +        if (ap_open(&s->error_log, fname, APR_BUFFERED | APR_APPEND | 
  +                    APR_READ | APR_WRITE, APR_OS_DEFAULT, p) != APR_SUCCESS) {
               perror("fopen");
               fprintf(stderr, "%s: could not open error log file %s.\n",
   		    ap_server_argv0, fname);
  @@ -554,7 +554,7 @@
   			       );
       }
   
  -    if(ap_open(&pid_file, p, fname, APR_WRITE | APR_BUFFERED, APR_OS_DEFAULT) != APR_SUCCESS)
{
  +    if(ap_open(&pid_file, fname, APR_WRITE | APR_BUFFERED, APR_OS_DEFAULT, p) != APR_SUCCESS)
{
   	perror("fopen");
           fprintf(stderr, "%s: could not log pid to file %s\n",
   		ap_server_argv0, fname);
  
  
  
  1.14      +1 -1      apache-2.0/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- util.c	1999/10/06 23:04:08	1.13
  +++ util.c	1999/10/14 14:36:38	1.14
  @@ -877,7 +877,7 @@
           return NULL;
       }
    
  -    stat = ap_open(&file, p, name, APR_READ | APR_BUFFERED, APR_OS_DEFAULT);
  +    stat = ap_open(&file, name, APR_READ | APR_BUFFERED, APR_OS_DEFAULT, p);
   #ifdef DEBUG
       saved_errno = errno;
       ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, NULL,
  
  
  
  1.13      +4 -4      apache-2.0/src/modules/mpm/dexter/acceptlock.c
  
  Index: acceptlock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/acceptlock.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- acceptlock.c	1999/10/13 21:14:06	1.12
  +++ acceptlock.c	1999/10/14 14:36:39	1.13
  @@ -509,8 +509,8 @@
       init_lock_fname(p);
       for (i = 0; i < lock_count; i++) {
           lock_fname = expand_lock_fname(p, i);
  -        ap_open(&tempfile, p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
  -                APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
  +        ap_open(&tempfile, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
  +                APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, p);
           ap_get_os_file(&lock_fd[i], tempfile);
   	if (lock_fd[i] == -1) {
   	    perror("open");
  @@ -584,7 +584,7 @@
       for (i = 0; i < lock_count; i++) {
           char *lock_fname = expand_lock_fname(p, i);
       
  -        ap_open(&tempfile, p, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE);
  +        ap_open(&tempfile, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE, p);
           ap_get_os_file(&lock_fd[i], tempfile);
           if (lock_fd[i] == -1) {
   	  ap_log_error(APLOG_MARK, APLOG_EMERG, 
  @@ -611,7 +611,7 @@
       for (i = 0; i < lock_count; i++) {
           lock_fname = expand_lock_fname(p, i);
           unlink(lock_fname);
  -        ap_open(&tempfile, p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL, APR_UREAD
| APR_UWRITE);
  +        ap_open(&tempfile, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL, APR_UREAD
| APR_UWRITE, p);
           ap_get_os_file(&lock_fd[i], tempfile);
           if (lock_fd[i] == -1) {
   	    ap_log_error(APLOG_MARK, APLOG_EMERG, 
  
  
  
  1.14      +5 -5      apache-2.0/src/modules/mpm/mpmt_pthread/acceptlock.c
  
  Index: acceptlock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/acceptlock.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- acceptlock.c	1999/10/11 22:39:43	1.13
  +++ acceptlock.c	1999/10/14 14:36:41	1.14
  @@ -504,8 +504,8 @@
       init_lock_fname(p);
       for (i = 0; i < lock_count; i++) {
           lock_fname = expand_lock_fname(p, i);
  -        ap_open(&tempfile, p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL, 
  -                APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
  +        ap_open(&tempfile, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL, 
  +                APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, p);
   	ap_get_os_file(&lock_fd[i], tempfile);
   	if (lock_fd[i] == -1) {
   	    perror("open");
  @@ -579,7 +579,7 @@
       for (i = 0; i < lock_count; i++) {
           char *lock_fname = expand_lock_fname(p, i);
       
  -        ap_open(&tempfile, p, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE);
  +        ap_open(&tempfile, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE, p);
           ap_get_os_file(&lock_fd[i], tempfile);
           if (lock_fd[i] == -1) {
   	  ap_log_error(APLOG_MARK, APLOG_EMERG, 
  @@ -606,8 +606,8 @@
       for (i = 0; i < lock_count; i++) {
           lock_fname = expand_lock_fname(p, i);
           unlink(lock_fname);
  -        ap_open(&tempfile, p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
  -                APR_UREAD | APR_UWRITE);
  +        ap_open(&tempfile, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
  +                APR_UREAD | APR_UWRITE, p);
           ap_get_os_file(&lock_fd[i], tempfile);
           if (lock_fd[i] == -1) {
   	    ap_log_error(APLOG_MARK, APLOG_EMERG, 
  
  
  
  1.45      +5 -5      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- prefork.c	1999/10/13 20:36:32	1.44
  +++ prefork.c	1999/10/14 14:36:43	1.45
  @@ -541,8 +541,8 @@
       unlock_it.l_pid = 0;		/* pid not actually interesting */
   
       expand_lock_fname(p);
  -    ap_open(&tempfile, p, ap_lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
  -            APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
  +    ap_open(&tempfile, ap_lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
  +            APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, p);
       ap_get_os_file(&lock_fd, tempfile);
       if (lock_fd == -1) {
   	perror("open");
  @@ -604,7 +604,7 @@
   {
       ap_file_t *tempfile;
   
  -    ap_open(&tempfile, p, ap_lock_fname, APR_WRITE, APR_UREAD|APR_UWRITE);
  +    ap_open(&tempfile, ap_lock_fname, APR_WRITE, APR_UREAD|APR_UWRITE, p);
       if (!tempfile) {
   	ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
   		    "Child cannot open lock file: %s", ap_lock_fname);
  @@ -623,8 +623,8 @@
   
       expand_lock_fname(p);
       unlink(ap_lock_fname);
  -    ap_open(&tempfile, p, ap_lock_fname, APR_CREATE|APR_WRITE|APR_EXCL,
  -	    APR_UREAD|APR_UWRITE);
  +    ap_open(&tempfile, ap_lock_fname, APR_CREATE|APR_WRITE|APR_EXCL,
  +	    APR_UREAD|APR_UWRITE, p);
       if (!tempfile) {
   	ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
   		    "Parent cannot open lock file: %s", ap_lock_fname);
  
  
  
  1.9       +2 -2      apache-2.0/src/modules/standard/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_asis.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_asis.c	1999/10/11 22:39:47	1.8
  +++ mod_asis.c	1999/10/14 14:36:45	1.9
  @@ -79,8 +79,8 @@
   	return NOT_FOUND;
       }
   
  -    if (ap_open(&f, r->pool, r->filename, APR_READ | APR_BUFFERED, 
  -                APR_OS_DEFAULT) != APR_SUCCESS) {
  +    if (ap_open(&f, r->filename, APR_READ | APR_BUFFERED, 
  +                APR_OS_DEFAULT, r->pool) != APR_SUCCESS) {
   	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "file permissions deny server access: %s", r->filename);
   	return FORBIDDEN;
  
  
  
  1.10      +6 -6      apache-2.0/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_autoindex.c	1999/10/11 22:39:49	1.9
  +++ mod_autoindex.c	1999/10/14 14:36:47	1.10
  @@ -986,8 +986,8 @@
   		 * the file's contents, any HTML header it had won't end up
   		 * where it belongs.
   		 */
  -		if (ap_open(&f, r->pool, rr->filename, APR_READ | APR_BUFFERED,
  -                            APR_OS_DEFAULT) == APR_SUCCESS) {
  +		if (ap_open(&f, rr->filename, APR_READ | APR_BUFFERED,
  +                            APR_OS_DEFAULT, r->pool) == APR_SUCCESS) {
   		    emit_preamble(r, title);
   		    emit_amble = 0;
   		    do_emit_plain(r, f);
  @@ -1054,8 +1054,8 @@
   		/*
   		 * If we can open the file, suppress the signature.
   		 */
  -		if (ap_open(&f, r->pool, rr->filename, APR_READ | APR_BUFFERED,
  -                            APR_OS_DEFAULT) == APR_SUCCESS) {
  +		if (ap_open(&f, rr->filename, APR_READ | APR_BUFFERED,
  +                            APR_OS_DEFAULT, r->pool) == APR_SUCCESS) {
   		    do_emit_plain(r, f);
   		    ap_close(f);
   		    suppress_sig = 1;
  @@ -1090,8 +1090,8 @@
   			"text/html")
   	    || !strcmp(r->content_type, INCLUDES_MAGIC_TYPE))
   	&& !r->content_encoding) {
  -        if (ap_open(&thefile, r->pool, r->filename, APR_READ | APR_BUFFERED,
  -                    APR_OS_DEFAULT) != APR_SUCCESS) {
  +        if (ap_open(&thefile, r->filename, APR_READ | APR_BUFFERED,
  +                    APR_OS_DEFAULT, r->pool) != APR_SUCCESS) {
   	    return NULL;
   	}
           n = sizeof(char) * (MAX_STRING_LEN - 1);
  
  
  
  1.7       +1 -1      apache-2.0/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_log_config.c	1999/10/04 16:38:16	1.6
  +++ mod_log_config.c	1999/10/14 14:36:49	1.7
  @@ -1001,7 +1001,7 @@
       }
       else {
           const char *fname = ap_server_root_relative(p, cls->fname);
  -        if (ap_open(&cls->log_fd, p, fname, xfer_flags, xfer_mode) != APR_SUCCESS)
{
  +        if (ap_open(&cls->log_fd, fname, xfer_flags, xfer_mode, p) != APR_SUCCESS)
{
               ap_log_error(APLOG_MARK, APLOG_ERR, s,
                            "could not open transfer log file %s.", fname);
               exit(1);
  
  
  
  1.10      +2 -2      apache-2.0/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_negotiation.c	1999/10/11 22:39:52	1.9
  +++ mod_negotiation.c	1999/10/14 14:36:49	1.10
  @@ -782,8 +782,8 @@
       /* We are not using multiviews */
       neg->count_multiviews_variants = 0;
   
  -    if (ap_open(&map, neg->pool, rr->filename, APR_READ | APR_BUFFERED,
  -                APR_OS_DEFAULT) != APR_SUCCESS) {
  +    if (ap_open(&map, rr->filename, APR_READ | APR_BUFFERED,
  +                APR_OS_DEFAULT, neg->pool) != APR_SUCCESS) {
           ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                         "cannot access type map file: %s", rr->filename);
           return HTTP_FORBIDDEN;
  
  
  

Mime
View raw message