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/os/beos beosd.c
Date Tue, 16 Nov 1999 18:32:11 GMT
rbb         99/11/16 10:32:09

  Modified:    .        STATUS
               src/lib/apr/include apr_lib.h
               src/main http_config.c http_connection.c http_core.c
                        http_protocol.c http_request.c http_vhost.c util.c
                        util_md5.c util_script.c
               src/modules/mpm/dexter dexter.c
               src/modules/mpm/mpmt_beos mpmt_beos.c
               src/modules/mpm/mpmt_pthread mpmt_pthread.c scoreboard.c
               src/modules/mpm/prefork prefork.c
               src/modules/mpm/spmt_os2 spmt_os2.c
               src/modules/mpm/winnt winnt.c
               src/os/beos beosd.c
  Log:
  Cleanup the ZZZ comments.  Basically these used to mark places where APR
  is needed.  It is much easier to do this conversion by hand than by
  searching for old comments, so they are going away now.
  
  Revision  Changes    Path
  1.15      +1 -3      apache-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-2.0/STATUS,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- STATUS	1999/11/16 15:11:51	1.14
  +++ STATUS	1999/11/16 18:30:18	1.15
  @@ -1,5 +1,5 @@
   Apache 2.0 STATUS:
  -Last modified at [$Date: 1999/11/16 15:11:51 $]
  +Last modified at [$Date: 1999/11/16 18:30:18 $]
   
   Release:
   
  @@ -117,8 +117,6 @@
           Status: ?
   
       * TODO in source -- just do an egrep on "TODO" and see what's there
  -
  -    * Odd comments in source (egrep for "ZZZ") need to be cleaned-up
   
       * Work on other MPMs. Possible MPMs discussed or in progress include:
   
  
  
  
  1.14      +0 -7      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- apr_lib.h	1999/10/13 18:07:22	1.13
  +++ apr_lib.h	1999/11/16 18:30:26	1.14
  @@ -382,13 +382,6 @@
   			void *data, enum kill_conditions kill_how,
   			FILE **pipe_in, FILE **pipe_out,
   			FILE **pipe_err);
  -#if 0
  -API_EXPORT(int)
  -	ap_bspawn_child(ap_context_t *p,
  -			 int (*func) (void *v, ap_child_info_t *c),
  -			 void *data, enum kill_conditions kill_how,
  -			 BUFF **pipe_in, BUFF **pipe_out, BUFF **pipe_err);
  -#endif /* 0 */
   
   API_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size);
   
  
  
  
  1.18      +3 -5      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- http_config.c	1999/11/08 06:05:48	1.17
  +++ http_config.c	1999/11/16 18:30:32	1.18
  @@ -1021,14 +1021,14 @@
   
       if (!(strcmp(fname, ap_server_root_relative(p, RESOURCE_CONFIG_FILE))) ||
   	!(strcmp(fname, ap_server_root_relative(p, ACCESS_CONFIG_FILE)))) {
  -	if (stat(fname, &finfo) == -1)   /* ZZZ  can we read the file?  ACCESS better here.
*/
  +	if (stat(fname, &finfo) == -1)   
   	    return;
       }
   
       /* don't require conf/httpd.conf if we have a -C or -c switch */
       if((ap_server_pre_read_config->nelts || ap_server_post_read_config->nelts) &&
          !(strcmp(fname, ap_server_root_relative(p, SERVER_CONFIG_FILE)))) {
  -	if (stat(fname, &finfo) == -1)     /* ZZZ  can we read the file?  ACCESS better here.
*/ 
  +	if (stat(fname, &finfo) == -1)     
   	    return;
       }
   
  @@ -1041,7 +1041,6 @@
       parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
   
       if (ap_pcfg_openfile(&parms.config_file, p, fname) != APR_SUCCESS) {
  -        /* ZZZ  use ap_strerror() once it exists to print an error message */
   	fprintf(stderr, "%s: could not open document config file %s\n",
   		ap_server_argv0, fname);
   	exit(1);
  @@ -1262,14 +1261,13 @@
       s->limit_req_line = DEFAULT_LIMIT_REQUEST_LINE;
       s->limit_req_fieldsize = DEFAULT_LIMIT_REQUEST_FIELDSIZE;
       s->limit_req_fields = DEFAULT_LIMIT_REQUEST_FIELDS;
  -    s->timeout = DEFAULT_TIMEOUT;     /*ZZZ use AP default timeouts here*/
  +    s->timeout = DEFAULT_TIMEOUT;     
       s->keep_alive_timeout = DEFAULT_KEEPALIVE_TIMEOUT;
       s->keep_alive_max = DEFAULT_KEEPALIVE;
       s->keep_alive = 1;
       s->next = NULL;
       s->addrs = ap_pcalloc(p, sizeof(server_addr_rec));
       /* NOT virtual host; don't match any real network interface */
  -    /* ZZZ  Initialize the Network Address here. */
       s->addrs->host_addr.s_addr = htonl(INADDR_ANY);
       s->addrs->host_port = 0;	/* matches any port */
       s->addrs->virthost = "";	/* must be non-NULL */
  
  
  
  1.24      +6 -7      apache-2.0/src/main/http_connection.c
  
  Index: http_connection.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- http_connection.c	1999/10/26 22:25:02	1.23
  +++ http_connection.c	1999/11/16 18:30:34	1.24
  @@ -103,14 +103,14 @@
   #ifdef USE_SO_LINGER
   #define NO_LINGCLOSE		/* The two lingering options are exclusive */
   
  -static void sock_enable_linger(int s) /* // ZZZZZ abstract the socket, s */
  +static void sock_enable_linger(int s) 
   {
  -    struct linger li;                 /* // ZZZZZ SocketOptions... */
  +    struct linger li;                 
   
       li.l_onoff = 1;
       li.l_linger = MAX_SECS_TO_LINGER;
   
  -    if (setsockopt(s, SOL_SOCKET, SO_LINGER, /* // ZZZZZ abstract, return SUCCESS or not
*/
  +    if (setsockopt(s, SOL_SOCKET, SO_LINGER, 
   		   (char *) &li, sizeof(struct linger)) < 0) {
   	ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf,
   	            "setsockopt: (SO_LINGER)");
  @@ -130,10 +130,9 @@
    * distinguish between a dropped connection and something that might be
    * worth logging.
    */
  -/*ZZZ this routine needs to be adapted for use with poll()*/
   static void lingering_close(request_rec *r)     
   {
  -  /*ZZZ remove the hardwired 512. This is an IO Buffer Size */
  +  /*TODO remove the hardwired 512. This is an IO Buffer Size */
       char dummybuf[512];    
       struct pollfd pd;
       int lsd;
  @@ -156,7 +155,7 @@
   
       lsd = r->connection->client->fd;
   
  -    if ((shutdown(lsd, 1) != 0)  /* ZZZ abstract shutdown */
  +    if ((shutdown(lsd, 1) != 0)  
           || ap_is_aborted(r->connection)) {
   	ap_bclose(r->connection->client);
   	return;
  @@ -184,7 +183,7 @@
           pd.revents = 0;
       } while ((poll(&pd, 1, 2) == 1)   
                && read(lsd, dummybuf, sizeof(dummybuf)));
  -      /* && (time() = epoch) < max_wait); */    /* ZZZZ time function is not
good... */
  +      /* && (time() = epoch) < max_wait); */    
   
       /* Should now have seen final ack.  Safe to finally kill socket */
       ap_bclose(r->connection->client);
  
  
  
  1.23      +2 -6      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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- http_core.c	1999/11/08 06:05:50	1.22
  +++ http_core.c	1999/11/16 18:30:37	1.23
  @@ -518,8 +518,6 @@
   
   
   /* Code from Harald Hanche-Olsen <hanche@imf.unit.no> */
  -/* ZZZ let's pass the buffer and the host entry so we don't have to allocate
  -   another stack frame. */
   static ap_inline void do_double_reverse (conn_rec *conn)
   {
       struct hostent *hptr;
  @@ -533,8 +531,8 @@
   	conn->double_reverse = -1;
   	return;
       }
  -    hptr = gethostbyname(conn->remote_host);   /*ZZZ change to AP func */
  -    if (hptr) {          /*ZZZ enumerate through host entries */
  +    hptr = gethostbyname(conn->remote_host);   
  +    if (hptr) {          
   	char **haddr;
   
   	for (haddr = hptr->h_addr_list; *haddr; haddr++) {
  @@ -573,7 +571,6 @@
   	&& conn->remote_host == NULL
   	&& (type == REMOTE_DOUBLE_REV
   	    || hostname_lookups != HOSTNAME_LOOKUP_OFF)) {
  -	/* ZZZ change to AP functions. */
   	iaddr = &(conn->remote_addr.sin_addr);
   	hptr = gethostbyaddr((char *)iaddr, sizeof(struct in_addr), AF_INET);
   	if (hptr != NULL) {
  @@ -2511,7 +2508,6 @@
       if (r->method_number == M_PUT) {
           return METHOD_NOT_ALLOWED;
       }
  -    /* ZZZ can we store if the file exists or not? */
       if (r->finfo.st_mode == 0 || (r->path_info && *r->path_info)) {
   	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r,
   		      "File does not exist: %s",r->path_info ?
  
  
  
  1.37      +0 -3      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- http_protocol.c	1999/11/05 15:45:04	1.36
  +++ http_protocol.c	1999/11/16 18:30:40	1.37
  @@ -313,7 +313,6 @@
            ((r->proto_num >= HTTP_VERSION(1,1)) &&
   	  (r->chunked = 1))) && /* THIS CODE IS CORRECT, see comment above. */
           r->server->keep_alive &&
  -	/* ZZZ change to APR keepalive timeout defined value */
           (r->server->keep_alive_timeout > 0) &&
           ((r->server->keep_alive_max == 0) ||
            (r->server->keep_alive_max > r->connection->keepalives)) &&
  @@ -382,7 +381,6 @@
        * were given a time in the future, we return the current time - the
        * Last-Modified can't be in the future.
        */
  -    /* ZZZ Change time call to use time AP time thread functions. */
       now = (mtime < r->request_time) ? r->request_time : time(NULL);
       return (mtime > now) ? now : mtime;
   }
  @@ -408,7 +406,6 @@
           return OK;
       }
   
  -    /* ZZZ We are changing time(NULL) to AP time thread functions. */
       mtime = (r->mtime != 0) ? r->mtime : time(NULL);
   
       /* If an If-Match request-header field was given
  
  
  
  1.9       +4 -13     apache-2.0/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- http_request.c	1999/10/20 12:49:55	1.8
  +++ http_request.c	1999/11/16 18:30:43	1.9
  @@ -116,7 +116,6 @@
   static int check_safe_file(request_rec *r)
   {
   
  -  /* ZZZ change to AP defines */
       if (r->finfo.st_mode == 0         /* doesn't exist */
           || S_ISDIR(r->finfo.st_mode)
           || S_ISREG(r->finfo.st_mode)
  @@ -261,21 +260,18 @@
            }
            else {
                errno = 0;
  -	     /* ZZZ change to AP func for File Info */
                rv = stat(path, &r->finfo);
            }
   
           if (cp != end)
               *cp = '/';
   
  -        if (!rv) {    /* ZZZ AP Status check here */
  -
  +        if (!rv) {    
               /*
                * Aha!  Found something.  If it was a directory, we will search
                * contents of that directory for a multi_match, so the PATH_INFO
                * argument starts with the component after that.
                */
  -	  /* ZZZ use AP file type checking defines */
               if (S_ISDIR(r->finfo.st_mode) && last_cp) {
                   r->finfo.st_mode = 0;   /* No such file... */
                   cp = last_cp;
  @@ -290,8 +286,6 @@
   	 */
   	r->finfo.st_mode = 0;
   
  -	/* ZZZ Let's throw some AP Errno checking in here and get rid of the
  -	   #defines. */
   #if defined(ENOENT) && defined(ENOTDIR)
           if (errno == ENOENT || errno == ENOTDIR) {
               last_cp = cp;
  @@ -303,7 +297,7 @@
                   --cp;
           }
           else {
  -#if defined(EACCES)      /* ZZZ again, AP error checking. */
  +#if defined(EACCES)
               if (errno != EACCES)
   #endif
                   ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
  @@ -442,8 +436,7 @@
       if (test_filename[test_filename_len - 1] == '/')
           --num_dirs;
   
  -    if (S_ISDIR(r->finfo.st_mode))     /* zzz use AP funcs and defines to make
  -					  this quicker */
  +    if (S_ISDIR(r->finfo.st_mode))     
           ++num_dirs;
   
       /*
  @@ -578,7 +571,7 @@
        * S_ISDIR test.  But if you accessed /symlink/index.html, for example,
        * you would *not* get the 403.
        */
  -    if (!S_ISDIR(r->finfo.st_mode)   /* ZZZ use AP funcs and defines */
  +    if (!S_ISDIR(r->finfo.st_mode) 
           && (res = check_symlinks(r->filename, ap_allow_options(r)))) {
           ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
                       "Symbolic link not allowed: %s", r->filename);
  @@ -867,7 +860,6 @@
           rnew->filename = ap_make_full_path(rnew->pool, fdir, new_file);
           ap_parse_uri(rnew, rnew->uri);    /* fill in parsed_uri values */
   
  -	/* ZZZ use AP funcs to get File Info */
           if (stat(rnew->filename, &rnew->finfo) < 0) {
               rnew->finfo.st_mode = 0;
           }
  @@ -883,7 +875,6 @@
            * no matter what, if it's a subdirectory, we need to re-run
            * directory_walk
            */
  -	/* ZZZ use AP funcs and defines for this. */
           if (S_ISDIR(rnew->finfo.st_mode)) {  
               res = directory_walk(rnew);
               if (!res) {
  
  
  
  1.7       +0 -7      apache-2.0/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- http_vhost.c	1999/10/20 12:49:55	1.6
  +++ http_vhost.c	1999/11/16 18:30:46	1.7
  @@ -167,9 +167,6 @@
   static const char *get_addresses(ap_context_t *p, char *w, server_addr_rec ***paddr,
   			    unsigned port)
   {
  -  /* ZZZ redesign to use AP funcs and types.  Will see what I can do to make it
  -     similar using posix std's. */
  -
       struct hostent *hep;
       unsigned long my_addr;
       server_addr_rec *sar;
  @@ -424,7 +421,6 @@
       fprintf(f, "VirtualHost configuration:\n");
       for (i = 0; i < IPHASH_TABLE_SIZE; ++i) {
   	for (ic = iphash_table[i]; ic; ic = ic->next) {
  -	  /* ZZZ should we change the Net addr to a string for this? */
   	    if (ic->sar->host_port == 0) {
   		ap_snprintf(buf, sizeof(buf), "%pA:*", &ic->sar->host_addr);
   	    }
  @@ -475,8 +471,6 @@
   /* compile the tables and such we need to do the run-time vhost lookups */
   void ap_fini_vhost_config(ap_context_t *p, server_rec *main_s)
   {
  -  /* ZZZ need to redesign for use with AP funcs. will look into this later.
  -   */
       server_addr_rec *sar;
       int has_default_vhost_addr;
       server_rec *s;
  @@ -781,7 +775,6 @@
        *   names we'll match have ports associated with them
        */
       const char *host = r->hostname;
  -    /* ZZZ use AP func here. */
       unsigned port = ntohs(r->connection->local_addr.sin_port);
       server_rec *s;
       server_rec *last_s;
  
  
  
  1.17      +1 -8      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- util.c	1999/11/02 15:15:07	1.16
  +++ util.c	1999/11/16 18:30:47	1.17
  @@ -103,8 +103,6 @@
   
   API_EXPORT(char *) ap_get_time()
   {
  -  /* ZZZ When we abstract out time, this whole function should change to use
  -     AP funcs. */
       time_t t;
       char *time_string;
   
  @@ -136,8 +134,6 @@
   
   API_EXPORT(char *) ap_ht_time(ap_context_t *p, time_t t, const char *fmt, int gmt)
   {
  -  /* ZZZ this function can be replaced by calls to time formatting routines
  -     in APR.  */
       char ts[MAX_STRING_LEN];
       char tf[MAX_STRING_LEN];
       struct tm *tms;
  @@ -190,7 +186,7 @@
       char *date_str_ptr = date_str;
       int real_year;
   
  -    tms = gmtime(&sec);    /* ZZZ replace with AP time routine */
  +    tms = gmtime(&sec);    
   
       /* Assumption: this is always 3 */
       /* i = strlen(ap_day_snames[tms->tm_wday]); */
  @@ -1665,7 +1661,6 @@
   {
       struct stat finfo;
   
  -    /* ZZZ replace with AP File Info func. */
       if (stat(path, &finfo) == -1)
   	return 0;		/* in error condition, just return no */
   
  @@ -1914,7 +1909,6 @@
    */
   unsigned long ap_get_virthost_addr(char *w, unsigned short *ports)
   {
  -  /* ZZZ Redesign for AP func changes */
       struct hostent *hep;
       unsigned long my_addr;
       char *p;
  @@ -1986,7 +1980,6 @@
       char *server_hostname;
       struct hostent *p;
   
  -    /* ZZZ change to use AP funcs. */
   #ifdef BEOS
       if (gethostname(str, sizeof(str) - 1) == 0)
   #else
  
  
  
  1.5       +0 -4      apache-2.0/src/main/util_md5.c
  
  Index: util_md5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_md5.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- util_md5.c	1999/09/08 14:15:44	1.4
  +++ util_md5.c	1999/11/16 18:30:49	1.5
  @@ -198,7 +198,6 @@
       int nbytes;
   
       ap_MD5Init(&context);
  -    /* ZZZ use AP func instead of fread. */
       while ((nbytes = read(infile, buf, sizeof(buf)))) {
   	length += nbytes;
           if (!convert) {
  @@ -206,7 +205,6 @@
           }
   	ap_MD5Update(&context, buf, nbytes);
       }
  -    /* ZZZ use AP seek func instead of REWIND. */
       lseek(infile, 0L, SEEK_SET);
       return ap_md5contextTo64(p, &context);
   }
  @@ -221,12 +219,10 @@
       int nbytes;
   
       ap_MD5Init(&context);
  -    /* ZZZ use AP func instead of fread. */
       while ((nbytes = read(infile, buf, sizeof(buf)))) {
   	length += nbytes;
   	ap_MD5Update(&context, buf, nbytes);
       }
  -    /* ZZZ use AP seek func instead of REWIND. */
       lseek(infile, 0L, SEEK_SET);
       return ap_md5contextTo64(p, &context);
   }
  
  
  
  1.19      +0 -3      apache-2.0/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- util_script.c	1999/11/09 09:01:15	1.18
  +++ util_script.c	1999/11/16 18:30:51	1.19
  @@ -682,9 +682,6 @@
   }
   #endif
   
  -/* ZZZ need to look at this in more depth and convert to an AP func so we 
  -   can get rid of OS specific code.
  -   */
   #if 0
   API_EXPORT(int) ap_call_exec(request_rec *r, ap_child_info_t *pinfo, char *argv0,
   			     char **env, int shellcmd)
  
  
  
  1.56      +2 -4      apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- dexter.c	1999/11/16 03:00:38	1.55
  +++ dexter.c	1999/11/16 18:31:18	1.56
  @@ -704,7 +704,7 @@
    */
   
   #if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
  -static void sock_disable_nagle(int s) /* ZZZ abstract */
  +static void sock_disable_nagle(int s)
   {
       /* The Nagle algorithm says that we should delay sending partial
        * packets in hopes of getting more data.  We don't want to do
  @@ -1086,7 +1086,7 @@
       }
   }
   
  -static int make_child(server_rec *s, int slot, time_t now) /* ZZZ */
  +static int make_child(server_rec *s, int slot, time_t now)
   {
       int pid;
   
  @@ -1254,7 +1254,6 @@
   		    /* we're still doing a 1-for-1 replacement of dead
                        * children with new children
                        */
  -                    /* ZZZ abstract out for AP funcs. */
   		    make_child(server_conf, child_slot, time(NULL));
   		    --remaining_children_to_start;
   		}
  @@ -1658,7 +1657,6 @@
       }
   
       fname = ap_server_root_relative(cmd->pool, arg);
  -    /* ZZZ change this to the AP func FileInfo*/
       if ((stat(fname, &finfo) == -1) || !S_ISDIR(finfo.st_mode)) {
   	return ap_pstrcat(cmd->pool, "CoreDumpDirectory ", fname, 
   			  " does not exist or is not a directory", NULL);
  
  
  
  1.9       +2 -4      apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c
  
  Index: mpmt_beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mpmt_beos.c	1999/11/02 17:29:18	1.8
  +++ mpmt_beos.c	1999/11/16 18:31:30	1.9
  @@ -872,7 +872,7 @@
       return (0);
   }
   
  -static int make_child(server_rec *s, int slot, time_t now) /* ZZZ */
  +static int make_child(server_rec *s, int slot, time_t now)
   {
       thread_id tid;
       
  @@ -1017,7 +1017,6 @@
   		    /* we're still doing a 1-for-1 replacement of dead
                        * children with new children
                        */
  -                    /* ZZZ abstract out for AP funcs. */
   		    make_child(server_conf, child_slot, time(NULL));
   		    --remaining_children_to_start;
   		}
  @@ -1185,7 +1184,7 @@
   		    "SIGHUP received.  Attempting to restart");
       }
       if (!is_graceful) {
  -        ap_restart_time = time(NULL); /* ZZZZZ */
  +        ap_restart_time = time(NULL); 
       }
       delete_port(port_of_death);
       return 0;
  @@ -1376,7 +1375,6 @@
       }
   
       fname = ap_server_root_relative(cmd->pool, arg);
  -    /* ZZZ change this to the AP func FileInfo*/
       if ((stat(fname, &finfo) == -1) || !S_ISDIR(finfo.st_mode)) {
   	return ap_pstrcat(cmd->pool, "CoreDumpDirectory ", fname, 
   			  " does not exist or is not a directory", NULL);
  
  
  
  1.46      +3 -6      apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- mpmt_pthread.c	1999/11/15 23:29:47	1.45
  +++ mpmt_pthread.c	1999/11/16 18:31:36	1.46
  @@ -696,7 +696,7 @@
    */
   
   #if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
  -static void sock_disable_nagle(int s) /* ZZZ abstract */
  +static void sock_disable_nagle(int s) 
   {
       /* The Nagle algorithm says that we should delay sending partial
        * packets in hopes of getting more data.  We don't want to do
  @@ -1046,7 +1046,7 @@
       }
   }
   
  -static int make_child(server_rec *s, int slot, time_t now) /* ZZZ */
  +static int make_child(server_rec *s, int slot, time_t now) 
   {
       int pid;
   
  @@ -1220,7 +1220,6 @@
   	    idle_spawn_rate = 1;
   	}
   	else {
  -	    /* ZZZZ */
   	    
   	    if (idle_spawn_rate >= 8) {
   	        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, server_conf,
  @@ -1273,7 +1272,6 @@
   		    /* we're still doing a 1-for-1 replacement of dead
                        * children with new children
                        */
  -                    /* ZZZ abstract out for AP funcs. */
   		    make_child(server_conf, child_slot, time(NULL));
   		    --remaining_children_to_start;
   		}
  @@ -1487,7 +1485,7 @@
   		    "SIGHUP received.  Attempting to restart");
       }
       if (!is_graceful) {
  -        ap_restart_time = time(NULL); /* ZZZZZ */
  +        ap_restart_time = time(NULL); 
       }
       return 0;
   }
  @@ -1677,7 +1675,6 @@
       }
   
       fname = ap_server_root_relative(cmd->pool, arg);
  -    /* ZZZ change this to the AP func FileInfo*/
       if ((stat(fname, &finfo) == -1) || !S_ISDIR(finfo.st_mode)) {
   	return ap_pstrcat(cmd->pool, "CoreDumpDirectory ", fname, 
   			  " does not exist or is not a directory", NULL);
  
  
  
  1.10      +2 -2      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- scoreboard.c	1999/10/20 12:50:02	1.9
  +++ scoreboard.c	1999/11/16 18:31:39	1.10
  @@ -642,7 +642,7 @@
       ss = &ap_scoreboard_image->servers[child_num][thread_num];
   
       if (status == START_PREQUEST) {
  -      /*ss->start_time = GetCurrentTime(); ZZZ return time in uS since the 
  +      /*ss->start_time = GetCurrentTime(); return time in uS since the 
   	epoch. Some platforms do not support gettimeofday. Create a routine 
   	to get the current time is some useful units. */
           if (gettimeofday(&ss->start_time, (struct timezone *) 0) < 0) {
  @@ -651,7 +651,7 @@
       }
       else if (status == STOP_PREQUEST) {
         /*ss->stop_time = GetCurrentTime(); 
  -	ZZZ return time in uS since the epoch */
  +	return time in uS since the epoch */
           
           if (gettimeofday(&ss->stop_time, (struct timezone *) 0) < 0) {
               ss->start_time.tv_sec = ss->start_time.tv_usec = 0L;
  
  
  
  1.52      +0 -1      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.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- prefork.c	1999/11/15 19:50:25	1.51
  +++ prefork.c	1999/11/16 18:31:45	1.52
  @@ -2933,7 +2933,6 @@
       }
   
       fname = ap_server_root_relative(cmd->pool, arg);
  -    /* ZZZ change this to the AP func FileInfo*/
       if ((stat(fname, &finfo) == -1) || !S_ISDIR(finfo.st_mode)) {
   	return ap_pstrcat(cmd->pool, "CoreDumpDirectory ", fname, 
   			  " does not exist or is not a directory", NULL);
  
  
  
  1.22      +0 -1      apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- spmt_os2.c	1999/11/01 11:25:04	1.21
  +++ spmt_os2.c	1999/11/16 18:31:49	1.22
  @@ -1737,7 +1737,6 @@
       }
   
       fname = ap_server_root_relative(cmd->pool, arg);
  -    /* ZZZ change this to the AP func FileInfo*/
       if ((stat(fname, &finfo) == -1) || !S_ISDIR(finfo.st_mode)) {
   	return ap_pstrcat(cmd->pool, "CoreDumpDirectory ", fname, 
   			  " does not exist or is not a directory", NULL);
  
  
  
  1.30      +1 -2      apache-2.0/src/modules/mpm/winnt/winnt.c
  
  Index: winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- winnt.c	1999/11/08 18:54:12	1.29
  +++ winnt.c	1999/11/16 18:31:55	1.30
  @@ -361,7 +361,7 @@
       return;
   }
   
  -static void sock_disable_nagle(int s) /* ZZZ abstract */
  +static void sock_disable_nagle(int s) 
   {
       /* The Nagle algorithm says that we should delay sending partial
        * packets in hopes of getting more data.  We don't want to do
  @@ -1792,7 +1792,6 @@
       }
   
       fname = ap_server_root_relative(cmd->pool, arg);
  -    /* ZZZ change this to the AP func FileInfo*/
       if ((stat(fname, &finfo) == -1) || !S_ISDIR(finfo.st_mode)) {
   	return ap_pstrcat(cmd->pool, "CoreDumpDirectory ", fname, 
   			  " does not exist or is not a directory", NULL);
  
  
  
  1.5       +1 -1      apache-2.0/src/os/beos/beosd.c
  
  Index: beosd.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/beos/beosd.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- beosd.c	1999/10/22 11:25:41	1.4
  +++ beosd.c	1999/11/16 18:32:05	1.5
  @@ -70,7 +70,7 @@
   
       chdir("/");
   
  -/* ZZZ
  +/* 
    * fork() is evil if we're also doing spawn_thread...so we don't use it.
    * This means that it won't detach properly, so we'll have to find a way
    * round this. 
  
  
  

Mime
View raw message