tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
Date Tue, 06 Jul 2004 15:56:42 GMT
jfclere     2004/07/06 08:56:42

  Modified:    jk/native2/common jk_endpoint.c jk_logger_win32.c
                        jk_requtil.c
               jk/native2/server/apache2 mod_jk2.c
  Log:
  Use apr equivalent routine for snprintf, usleep and vsnprintf.
  
  Revision  Changes    Path
  1.29      +1 -1      jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c
  
  Index: jk_endpoint.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- jk_endpoint.c	21 Mar 2004 09:43:09 -0000	1.28
  +++ jk_endpoint.c	6 Jul 2004 15:56:41 -0000	1.29
  @@ -43,7 +43,7 @@
       if (wEnv->epStat == NULL) {
           if (wEnv->shm != NULL && wEnv->childId >= 0) {
               char shmName[128];
  -            snprintf(shmName, 128, "epStat.%d", wEnv->childId);
  +            apr_snprintf(shmName, 128, "epStat.%d", wEnv->childId);
   
               wEnv->epStat =
                   wEnv->shm->createSlot(env, wEnv->shm, shmName, 8096);
  
  
  
  1.12      +1 -1      jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c
  
  Index: jk_logger_win32.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_logger_win32.c	21 Mar 2004 09:43:09 -0000	1.11
  +++ jk_logger_win32.c	6 Jul 2004 15:56:41 -0000	1.12
  @@ -128,7 +128,7 @@
           }
   
   
  -        rc = _vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
  +        rc = apr_vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
   
           l->log(env, l, level, buf);
       }
  
  
  
  1.34      +1 -1      jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
  
  Index: jk_requtil.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- jk_requtil.c	15 Jun 2004 20:37:10 -0000	1.33
  +++ jk_requtil.c	6 Jul 2004 15:56:41 -0000	1.34
  @@ -494,7 +494,7 @@
       va_start(vargs, fmt);
       s->outPos = 0;              /* Temp - we don't buffer */
       ret =
  -        vsnprintf(s->outBuf + s->outPos, s->outSize - s->outPos, fmt, vargs);
  +        apr_vsnprintf(s->outBuf + s->outPos, s->outSize - s->outPos, fmt, vargs);
       va_end(vargs);
   
       s->write(env, s, s->outBuf, strlen(s->outBuf));
  
  
  
  1.85      +2 -2      jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
  
  Index: mod_jk2.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- mod_jk2.c	16 Jun 2004 15:42:03 -0000	1.84
  +++ mod_jk2.c	6 Jul 2004 15:56:41 -0000	1.85
  @@ -638,7 +638,7 @@
                    env->l->jkLog(env, env->l, JK_LOG_INFO,
                        "jk2_child_init() child %d not in scoreboard yet, spin %d\n", 
                        proc.pid, counter);
  -                 usleep(10);
  +                 apr_sleep((apr_interval_time_t)10);
                    workerEnv->childId = find_child_by_pid(&proc);
                }
                if (workerEnv->childId == -1) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message