cvs commit: apache-2.0/src/os/win32 util_win32.c

[stoddard]

stoddard99/12/08 15:56:34

  Modified:src/os/win32 util_win32.c
  Log:
  Add license statement to util_win32.c
  
  Revision  ChangesPath
  1.4   +57 -0 apache-2.0/src/os/win32/util_win32.c
  
  Index: util_win32.c
  ===
  RCS file: /home/cvs/apache-2.0/src/os/win32/util_win32.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- util_win32.c  1999/10/11 14:20:48 1.3
  +++ util_win32.c  1999/12/08 23:56:33 1.4
  @@ -1,3 +1,60 @@
  +/* 
  + * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
  + * 
  + * Redistribution and use in source and binary forms, with or without 
  + * modification, are permitted provided that the following conditions 
  + * are met: 
  + * 
  + * 1. Redistributions of source code must retain the above copyright 
  + *notice, this list of conditions and the following disclaimer.  
  + * 
  + * 2. Redistributions in binary form must reproduce the above copyright 
  + *notice, this list of conditions and the following disclaimer in 
  + *the documentation and/or other materials provided with the 
  + *distribution. 
  + * 
  + * 3. All advertising materials mentioning features or use of this 
  + *software must display the following acknowledgment: 
  + *"This product includes software developed by the Apache Group 
  + *for use in the Apache HTTP server project (http://www.apache.org/)." 
  + * 
  + * 4. The names "Apache Server" and "Apache Group" must not be used to 
  + *endorse or promote products derived from this software without 
  + *prior written permission. For written permission, please contact 
  + *[EMAIL PROTECTED] 
  + * 
  + * 5. Products derived from this software may not be called "Apache" 
  + *nor may "Apache" appear in their names without prior written 
  + *permission of the Apache Group. 
  + * 
  + * 6. Redistributions of any form whatsoever must retain the following 
  + *acknowledgment: 
  + *"This product includes software developed by the Apache Group 
  + *for use in the Apache HTTP server project (http://www.apache.org/)." 
  + * 
  + * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
  + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
  + * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
  + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
  + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
  + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
  + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
  + * OF THE POSSIBILITY OF SUCH DAMAGE. 
  + *  
  + * 
  + * This software consists of voluntary contributions made by many 
  + * individuals on behalf of the Apache Group and was originally based 
  + * on public domain software written at the National Center for 
  + * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
  + * For more information on the Apache Group and the Apache HTTP server 
  + * project, please see . 
  + * 
  + */ 
  +
   #include 
   #include 
   #include 
  
  
  

cvs commit: apache-2.0/src/os/win32 util_win32.c

[rbb]

rbb 99/10/11 07:20:48

  Modified:src  Configure
   src/include http_log.h
   src/lib/apr/file_io/unix open.c
   src/lib/apr/include apr_file_io.h apr_lib.h
apr_thread_proc.h
   src/lib/apr/lib apr_cpystrn.c apr_pools.c
   src/lib/apr/threadproc/unix proc.c
   src/main http_log.c
   src/os/beos os-inline.c os.c
   src/os/unix os-inline.c
   src/os/win32 util_win32.c
  Log:
  Make Apache use the new ap_create_process call.  This is the first of a
  group of patches.  This patch, allows the core server to compile and
  serve pages.  There is a set of patches which will follow to allow the
  standard modules to use ap_create_process.  This change should make
  writing code which spawns new processes easy to read and understand.
  Submitted by: Paul Reder
  
  Revision  ChangesPath
  1.12  +1 -1  apache-2.0/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-2.0/src/Configure,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Configure 1999/10/10 17:07:53 1.11
  +++ Configure 1999/10/11 14:20:36 1.12
  @@ -1748,7 +1748,7 @@
   fi
   cd ../..
   APRLIB=""
  -for lib in apr file network lock misc sig threadproc time; do
  +for lib in network threadproc file misc apr time lock sig; do
APRLIB="$APRLIB \$(SRCDIR)/lib/apr/libs/lib${lib}.a"
   done
   CFLAGS="$CFLAGS -I\$(SRCDIR)/lib/apr/include"
  
  
  
  1.5   +1 -1  apache-2.0/src/include/http_log.h
  
  Index: http_log.h
  ===
  RCS file: /home/cvs/apache-2.0/src/include/http_log.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- http_log.h1999/09/08 14:15:40 1.4
  +++ http_log.h1999/10/11 14:20:37 1.5
  @@ -138,7 +138,7 @@
   ap_context_t *p;
   #ifndef NO_RELIABLE_PIPED_LOGS
   char *program;
  -int pid;
  +ap_proc_t *pid;
   ap_file_t fds[2];
   #else
   ap_file_t *write_f;
  
  
  
  1.14  +14 -0 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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- open.c1999/10/06 23:03:46 1.13
  +++ open.c1999/10/11 14:20:38 1.14
  @@ -278,3 +278,17 @@
   return APR_SUCCESS;
   }   
   
  +/* ***APRDOC
  + * ap_status_t ap_ferror(ap_file_t *) 
  + *Is there an error on the stream?
  + * arg 1) The apr file we are testing.
  + * NOTE:  Returns -1 if the error indicator is set, APR_SUCCESS otherwise.
  + */
  +ap_status_t ap_ferror(ap_file_t *fptr)
  +{
  +if (ferror(fptr->filehand)) {
  +return (-1);
  +}
  +
  +return APR_SUCCESS;
  +}   
  
  
  
  1.11  +1 -0  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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_file_io.h 1999/10/08 13:47:03 1.10
  +++ apr_file_io.h 1999/10/11 14:20:38 1.11
  @@ -111,6 +111,7 @@
   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 *);
  +ap_status_t ap_ferror(ap_file_t *);
   
   ap_status_t ap_read(ap_file_t *, void *, ap_ssize_t *);
   ap_status_t ap_write(ap_file_t *, void *, ap_ssize_t *);
  
  
  
  1.12  +3 -2  apache-2.0/src/lib/apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_lib.h 1999/10/08 13:47:04 1.11
  +++ apr_lib.h 1999/10/11 14:20:38 1.12
  @@ -164,6 +164,8 @@
* Define the prototypes for the various APR GP routines.
*/
   API_EXPORT(char *) ap_cpystrn(char *d, const char *s, size_t l);
  +API_EXPORT(int) ap_tokenize_to_argv(ap_context_t *token_context,
  +char *arg_str, char ***argv_out);
   /*API_EXPORT(ap_mutex_t *) ap_create_mutex(void *m);*/
   API_EXPORT(int) ap_slack(int l, int h);
   API_EXPORT_NONSTD(int) ap_execle(const char *c, const char *a, ...);
  @@ -371,9 +373,8 @@
   API_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t 
*bufsize);
   API_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data);
   
  -/*API_EXPORT(void) ap_note_subprocess(ap_pool_t *a, pid_t pid,
  +API_EXPORT(v