httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apache-2.0/mpm/src/modules/standard mod_include.c
Date Fri, 06 Aug 1999 01:09:39 GMT
dgaudet     99/08/05 18:09:39

  Modified:    mpm/src/modules/standard mod_include.c
  Log:
  doc TODO
  
  Revision  Changes    Path
  1.5       +3 -16     apache-2.0/mpm/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_include.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_include.c	1999/07/27 12:05:08	1.4
  +++ mod_include.c	1999/08/06 01:09:38	1.5
  @@ -111,6 +111,9 @@
   /* just need some arbitrary non-NULL pointer which can't also be a request_rec */
   #define NESTED_INCLUDE_MAGIC	(&includes_module)
   
  +/* TODO: changing directory should be handled by CreateProcess */
  +#define ap_chdir_file(x) do {} while(0)
  +
   /* ------------------------ Environment function -------------------------- */
   
   /* XXX: could use ap_table_overlap here */
  @@ -614,10 +617,7 @@
       }
   
       ap_destroy_sub_req(rr);
  -    /*   changing directory should be handled by CreateProcess.
  -       #ifndef WIN32
       ap_chdir_file(r->filename);
  -    #endif */
   
       return 0;
   }
  @@ -737,10 +737,7 @@
               if (!error_fmt && ap_run_sub_req(rr)) {
                   error_fmt = "unable to include \"%s\" in parsed file %s";
               }
  -    /*   changing directory should be handled by CreateProcess.
  -	    #ifndef WIN32
               ap_chdir_file(r->filename);
  -	    #endif*/
               if (error_fmt) {
                   ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
   			    r, error_fmt, tag_val, r->filename);
  @@ -897,10 +894,7 @@
                   ap_rputs(error, r);
               }
               /* just in case some stooge changed directories */
  -    /*   changing directory should be handled by CreateProcess.	    
  -            #ifndef WIN32
               ap_chdir_file(r->filename);
  -	    #endif*/
           }
           else if (!strcmp(tag, "cgi")) {
               parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
  @@ -909,11 +903,7 @@
                               "invalid CGI ref \"%s\" in %s", tag_val, file);
                   ap_rputs(error, r);
               }
  -            /* grumble groan */
  -	        /*   changing directory should be handled by CreateProcess.
  -            #ifndef WIN32
               ap_chdir_file(r->filename);
  -	    #endif*/
           }
           else if (!strcmp(tag, "done")) {
               return 0;
  @@ -2163,10 +2153,7 @@
       printing = conditional_status = 1;
       if_nesting = 0;
   
  -    /*   changing directory should be handled by CreateProcess.
  -    #ifndef WIN32
       ap_chdir_file(r->filename);
  -    #endif*/
       if (r->args) {              /* add QUERY stuff to env cause it ain't yet */
           char *arg_copy = ap_pstrdup(r->pool, r->args);
   
  
  
  

Mime
View raw message