cvs commit: apache-apr/apr/file_io/unix open.c

[rbb]

rbb 99/05/07 11:19:20

  Modified:apr/file_io/unix open.c
  Log:
  Changing another malloc to apr_palloc.
  
  Revision  ChangesPath
  1.16  +3 -1  apache-apr/apr/file_io/unix/open.c
  
  Index: open.c
  ===
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/open.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- open.c1999/04/30 18:38:51 1.15
  +++ open.c1999/05/07 18:19:20 1.16
  @@ -75,8 +75,10 @@
   apr_file_t *apr_open(apr_context_t *cont, char *fname, apr_int32_t flag,  
apr_fileperms_t mode)
   {
   int oflags = 0;
  -apr_file_t *dafile = (apr_file_t *)malloc(sizeof(apr_file_t));
  +apr_file_t *dafilel;
   struct stat info;
  +
  +dafile = (apr_file_t *)apr_palloc(cont->pool, sizeof(apr_file_t));
   
   if ((flag & APR_READ) && (flag & APR_WRITE)) {
   oflags = O_RDWR;
  
  
  

cvs commit: apache-apr/apr/threadproc/unix proc.c

[rbb]

rbb 99/05/07 11:17:50

  Modified:apr/threadproc/unix proc.c
  Log:
  Just changing one malloc call to an apr_palloc call.
  
  Revision  ChangesPath
  1.6   +1 -1  apache-apr/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===
  RCS file: /home/cvs/apache-apr/apr/threadproc/unix/proc.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- proc.c1999/04/30 18:38:56 1.5
  +++ proc.c1999/05/07 18:17:49 1.6
  @@ -183,7 +183,7 @@
   while (args[i]) {
   i++;
   }
  -newargs = (char **)malloc(sizeof (char *) * (i + 3));
  +newargs = (char **)apr_palloc(cont->pool, sizeof (char *) * (i + 
3));
   newargs[0] = strdup(SHELL_PATH);
   newargs[1] = strdup("-c");
   i = 0;
  
  
  

cvs commit: apache-site/contributors index.html

[rasmus]

rasmus  99/05/07 10:42:17

  Modified:contributors index.html
  Log:
  
  
  Revision  ChangesPath
  1.71  +6 -6  apache-site/contributors/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/apache-site/contributors/index.html,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- index.html1999/04/12 08:50:48 1.70
  +++ index.html1999/05/07 17:42:16 1.71
  @@ -359,16 +359,16 @@
   Comments: What am I doing here?
   
   
  -
   Name: Rasmus Lerdorf
  -Email: mailto:[EMAIL PROTECTED]">[EMAIL 
PROTECTED]
  +Email: mailto:[EMAIL PROTECTED]">[EMAIL 
PROTECTED]
   URL: http://www.lerdorf.on.ca/";>http://www.lerdorf.on.ca/
  -Company: Lerdorf Consultants Inc.
  -Occupation: IT Consultant
  -Location: Toronto, Ontario, Canada
  +Company: IBM Corporation
  +Occupation: Senior Software Engineer
  +Location: Research Triangle Park, NC
   OS Expertise: Solaris, Linux
   Contribution: Wrote mod_info module included in the
  -   distribution, as well as mod_php which is available separately.
  +   distribution, as well as mod_php which is available separately from 
  +http://www.php.net";>www.php.net.
   
   
   
  
  
  

cvs commit: apache-apr/pthreads/src/main buff.c

[manoj]

manoj   99/05/06 23:57:50

  Modified:pthreads/src/main buff.c
  Log:
  typo
  
  Revision  ChangesPath
  1.8   +1 -1  apache-apr/pthreads/src/main/buff.c
  
  Index: buff.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/main/buff.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -u -r1.7 -r1.8
  --- buff.c1999/04/09 04:10:36 1.7
  +++ buff.c1999/05/07 06:57:50 1.8
  @@ -623,7 +623,7 @@
   #elif defined(O_NDELAY)
   fd_flags |= O_NDELAY;
   return fcntl(fd, F_SETFL, fd_flags);
  -#eli f defined(FNDELAY)
  +#elif defined(FNDELAY)
   fd_flags |= O_FNDELAY;
   return fcntl(fd, F_SETFL, fd_flags);
   #else
  
  
  

cvs commit: apache-1.3/src/os/os2 os.c os.h util_os2.c

[bjh]

bjh 99/05/06 22:49:47

  Modified:src/os/os2 os.c os.h util_os2.c
  Log:
  Provide system error messages instead of just OS/2 error codes for dynamic
  linking errors. I don't particularly like using static char buffers like
  this but ap_os_dso_error() doesn't take a pool.
  
  Revision  ChangesPath
  1.3   +1 -3  apache-1.3/src/os/os2/os.c
  
  Index: os.c
  ===
  RCS file: /home/cvs/apache-1.3/src/os/os2/os.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- os.c  1999/05/04 11:21:15 1.2
  +++ os.c  1999/05/07 05:49:46 1.3
  @@ -54,7 +54,5 @@
   
   const char *ap_os_dso_error(void)
   {
  -static char message[30];
  -sprintf( message, "OS/2 error code %d", rc );
  -return message;
  +return ap_os_error_message(rc);
   }
  
  
  
  1.15  +3 -0  apache-1.3/src/os/os2/os.h
  
  Index: os.h
  ===
  RCS file: /home/cvs/apache-1.3/src/os/os2/os.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- os.h  1999/05/04 11:21:16 1.14
  +++ os.h  1999/05/07 05:49:46 1.15
  @@ -35,6 +35,9 @@
   /* Use a specialized kill() function */
   int ap_os_kill(int pid, int sig);
   
  +/* Maps an OS error code to an error message */
  +char *ap_os_error_message(int err);
  +
   /* OS/2 doesn't have symlinks so S_ISLNK is always false */
   #define S_ISLNK(m) 0
   
  
  
  
  1.4   +32 -0 apache-1.3/src/os/os2/util_os2.c
  
  Index: util_os2.c
  ===
  RCS file: /home/cvs/apache-1.3/src/os/os2/util_os2.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- util_os2.c1999/05/01 05:15:52 1.3
  +++ util_os2.c1999/05/07 05:49:46 1.4
  @@ -63,3 +63,35 @@
   
   return rc;
   }
  +
  +
  +
  +char *ap_os_error_message(int err)
  +{
  +  static char result[200];
  +  char message[HUGE_STRING_LEN];
  +  ULONG len;
  +  char *pos;
  +  int c;
  +  
  +  if (DosGetMessage(NULL, 0, message, HUGE_STRING_LEN, err, "OSO001.MSG", 
&len) == 0) {
  +  len--;
  +  message[len] = 0;
  +  pos = result;
  +  
  +  if (len >= sizeof(result))
  +len = sizeof(result-1);
  +
  +  for (c=0; c

cvs commit: apache-1.3/src/main http_main.c

[dgaudet]

dgaudet 99/05/06 17:38:13

  Modified:src  CHANGES
   src/main http_main.c
  Log:
  loop around on EINTR from semop()
  
  Revision  ChangesPath
  1.1352+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1351
  retrieving revision 1.1352
  diff -u -r1.1351 -r1.1352
  --- CHANGES   1999/05/07 00:16:06 1.1351
  +++ CHANGES   1999/05/07 00:38:05 1.1352
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.7
   
  +  *) It's OK for a semop to return EINTR, just loop around and try
  + again.  [Dean Gaudet]
  +
 *) Fix configuration engine re-entrant hangups, which solve a
handful of problems seen with mod_perl  configuration sections
[Salvador Ortiz Garcia <[EMAIL PROTECTED]>]
  
  
  
  1.436 +10 -6 apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.435
  retrieving revision 1.436
  diff -u -r1.435 -r1.436
  --- http_main.c   1999/05/05 20:42:58 1.435
  +++ http_main.c   1999/05/07 00:38:11 1.436
  @@ -741,17 +741,21 @@
   
   static void accept_mutex_on(void)
   {
  -if (semop(sem_id, &op_on, 1) < 0) {
  - perror("accept_mutex_on");
  - clean_child_exit(APEXIT_CHILDFATAL);
  +while (semop(sem_id, &op_on, 1) < 0) {
  + if (errno != EINTR) {
  + perror("accept_mutex_on");
  + clean_child_exit(APEXIT_CHILDFATAL);
  + }
   }
   }
   
   static void accept_mutex_off(void)
   {
  -if (semop(sem_id, &op_off, 1) < 0) {
  - perror("accept_mutex_off");
  - clean_child_exit(APEXIT_CHILDFATAL);
  +while (semop(sem_id, &op_off, 1) < 0) {
  + if (errno != EINTR) {
  + perror("accept_mutex_off");
  + clean_child_exit(APEXIT_CHILDFATAL);
  + }
   }
   }
   
  
  
  

cvs commit: apache-1.3/src/main http_config.c http_core.c

[dougm]

dougm   99/05/06 17:16:13

  Modified:src  CHANGES
   src/include ap_compat.h ap_mmn.h http_config.h http_core.h
   src/main http_config.c http_core.c
  Log:
  Fix configuration engine re-entrant hangups, which solve a
  handful of problems seen with mod_perl  configuration sections
  
  Submitted by: Salvador Ortiz Garcia <[EMAIL PROTECTED]>
  Reviewed by:  Doug, Dean
  
  Revision  ChangesPath
  1.1351+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1350
  retrieving revision 1.1351
  diff -u -r1.1350 -r1.1351
  --- CHANGES   1999/05/06 00:49:38 1.1350
  +++ CHANGES   1999/05/07 00:16:06 1.1351
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.7
   
  +  *) Fix configuration engine re-entrant hangups, which solve a
  + handful of problems seen with mod_perl  configuration sections
  + [Salvador Ortiz Garcia <[EMAIL PROTECTED]>]
  +
 *) Mac OS and Mac OS X Server now use the appropriate custom layout
by default when building with APACI; allow for platform-specific
variable defaults in configure. [Wilfredo Sanchez]
  
  
  
  1.17  +2 -0  apache-1.3/src/include/ap_compat.h
  
  Index: ap_compat.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/ap_compat.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ap_compat.h   1999/01/28 09:24:58 1.16
  +++ ap_compat.h   1999/05/07 00:16:09 1.17
  @@ -23,6 +23,7 @@
   #define acquire_mutex  ap_acquire_mutex
   #define add_cgi_vars   ap_add_cgi_vars
   #define add_common_varsap_add_common_vars
  +#define add_file_conf  ap_add_file_conf
   #define add_module ap_add_module
   #define add_named_module   ap_add_named_module
   #define add_per_dir_conf   ap_add_per_dir_conf
  @@ -350,6 +351,7 @@
   #define server_root_relative   ap_server_root_relative
   #define set_byterange  ap_set_byterange
   #define set_callback_and_alarm ap_set_callback_and_alarm
  +#define set_config_vectors ap_set_config_vectors
   #define set_content_length ap_set_content_length
   #define set_etag   ap_set_etag
   #define set_file_slot  ap_set_file_slot
  
  
  
  1.34  +3 -1  apache-1.3/src/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- ap_mmn.h  1999/04/20 17:51:37 1.33
  +++ ap_mmn.h  1999/05/07 00:16:09 1.34
  @@ -215,6 +215,8 @@
* 19990108.7   - ap_isxdigit added
* 19990320 - METHODS and M_INVALID symbol values modified
* 19990320.1   - add ap_vrprintf()
  + * 19990320.2   - add cmd_parms.context, ap_set_config_vectors, 
  + *export ap_add_file_conf
*/
   
   #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */
  @@ -222,7 +224,7 @@
   #ifndef MODULE_MAGIC_NUMBER_MAJOR
   #define MODULE_MAGIC_NUMBER_MAJOR 19990320
   #endif
  -#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
  +#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */
   #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward 
compat */
   
   /* Useful for testing for features. */
  
  
  
  1.102 +3 -0  apache-1.3/src/include/http_config.h
  
  Index: http_config.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- http_config.h 1999/03/10 10:34:08 1.101
  +++ http_config.h 1999/05/07 00:16:10 1.102
  @@ -170,6 +170,8 @@
 */
   const command_rec *cmd;  /* configuration command */
   const char *end_token;   /* end token required to end a nested section */
  +void *context;   /* per_dir_config vector passed 
  +  * to handle_command */
   } cmd_parms;
   
   /* This structure records the existence of handlers in a module... */
  @@ -400,6 +402,7 @@
   
   CORE_EXPORT(const command_rec *) ap_find_command(const char *name, const 
command_rec *cmds);
   CORE_EXPORT(const command_rec *) ap_find_command_in_modules(const char 
*cmd_name, module **mod);
  +CORE_EXPORT(void *) ap_set_config_vectors(cmd_parms *parms, void *config, 
module *mod);
   CORE_EXPORT(const char *) ap_handle_command(cmd_parms *parms, void *config, 
const char *l);
   
   #endif