httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/src/modules/test mod_rndchunk.c
Date Mon, 27 Apr 1998 06:59:38 GMT
rse         98/04/26 23:59:38

  Modified:    .        STATUS
               src      CHANGES
               src/include compat.h buff.h http_log.h
               src/main buff.c http_protocol.c
               src/modules/standard mod_log_config.c
               src/modules/test mod_rndchunk.c
  Log:
  Some symbol renamings which were not caught by the BIG RENAMING
  because they are #defines:
  
      bputc              -> ap_bputc
      bgetc              -> ap_bgetc
      piped_log_write_fd -> ap_piped_log_write_fd
      piped_log_read_fd  -> ap_piped_log_read_fd
  
  Thanks to Dean for discovering them.
  
  Revision  Changes    Path
  1.332     +1 -0      apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.331
  retrieving revision 1.332
  diff -u -r1.331 -r1.332
  --- STATUS	1998/04/26 18:29:26	1.331
  +++ STATUS	1998/04/27 06:59:29	1.332
  @@ -67,6 +67,7 @@
       * Fix for the DEBUG_CGI (#ifdef'ed) situation in mod_cgi.c, PR#2114
       * Ralf's various bugfixes and cleanups for the configure script
       * Ralf's workaround for braindead awk when generating ap_config.h, PR#2139
  +    * Ralf's manual renaming of forgotten non-ap_-symbols because of #define
   
   Available Patches:
   
  
  
  
  1.795     +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.794
  retrieving revision 1.795
  diff -u -r1.794 -r1.795
  --- CHANGES	1998/04/26 18:29:28	1.794
  +++ CHANGES	1998/04/27 06:59:30	1.795
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3b7
   
  +  *) Manually fix some symbols which were not renamed to prefix ap_ in the BIG
  +     RENAMING process because they are defined as pre-processor macros instead
  +     of real functions: bputc, bgetc, piped_log_write_fd, piped_log_read_fd
  +     [Ralf S. Engelschall]
  +
     *) Workaround braindead AWK's when generating ap_config.h: The split() and
        substr() functions cannot be nested under vendor AWK from Solaris 2.6.
        [Ralf S. Engelschall] PR#2139
  
  
  
  1.4       +8 -4      apache-1.3/src/include/compat.h
  
  Index: compat.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- compat.h	1998/04/13 18:05:09	1.3
  +++ compat.h	1998/04/27 06:59:33	1.4
  @@ -39,6 +39,7 @@
   #define bfileno                        ap_bfileno
   #define bflsbuf                        ap_bflsbuf
   #define bflush                         ap_bflush
  +#define bgetc                          ap_bgetc
   #define bgetopt                        ap_bgetopt
   #define bgets                          ap_bgets
   #define bhalfduplex                    ap_bhalfduplex
  @@ -49,6 +50,7 @@
   #define bonerror                       ap_bonerror
   #define bprintf                        ap_bprintf
   #define bpushfd                        ap_bpushfd
  +#define bputc                          ap_bputc
   #define bputs                          ap_bputs
   #define bread                          ap_bread
   #define bsetflag                       ap_bsetflag
  @@ -209,6 +211,10 @@
   #define open_mutex                     ap_open_mutex
   #define open_piped_log                 ap_open_piped_log
   #define os_canonical_filename          ap_os_canonical_filename
  +#define os_dl_load                     ap_os_dso_load
  +#define os_dl_unload                   ap_os_dso_unload
  +#define os_dl_sym                      ap_os_dso_sym
  +#define os_dl_error                    ap_os_dso_error
   #define os_escape_path                 ap_os_escape_path
   #define os_is_path_absolute            ap_os_is_path_absolute
   #define overlay_tables                 ap_overlay_tables
  @@ -231,6 +237,8 @@
   #define pfopen                         ap_pfopen
   #define pgethostbyname                 ap_pgethostbyname
   #define pid_fname                      ap_pid_fname
  +#define piped_log_read_fd              ap_piped_log_read_fd
  +#define piped_log_write_fd             ap_piped_log_write_fd
   #define pool_is_ancestor               ap_pool_is_ancestor
   #define pool_join                      ap_pool_join
   #define popendir                       ap_popendir
  @@ -389,9 +397,5 @@
   #define util_uri_init                  ap_util_uri_init
   #define uudecode                       ap_uudecode
   #define vbprintf                       ap_vbprintf
  -#define os_dl_load                     ap_os_dso_load
  -#define os_dl_unload                   ap_os_dso_unload
  -#define os_dl_sym                      ap_os_dso_sym
  -#define os_dl_error                    ap_os_dso_error
   
   #endif /* APACHE_COMPAT_H */
  
  
  
  1.38      +4 -4      apache-1.3/src/include/buff.h
  
  Index: buff.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/buff.h,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- buff.h	1998/04/11 12:00:18	1.37
  +++ buff.h	1998/04/27 06:59:33	1.38
  @@ -168,20 +168,20 @@
   
   #ifndef CHARSET_EBCDIC
   
  -#define bgetc(fb)   ( ((fb)->incnt == 0) ? ap_bfilbuf(fb) : \
  +#define ap_bgetc(fb)   ( ((fb)->incnt == 0) ? ap_bfilbuf(fb) : \
   		    ((fb)->incnt--, *((fb)->inptr++)) )
   
  -#define bputc(c, fb) ((((fb)->flags & (B_EOUT|B_WRERR|B_WR)) != B_WR || \
  +#define ap_bputc(c, fb) ((((fb)->flags & (B_EOUT|B_WRERR|B_WR)) != B_WR || \
   		     (fb)->outcnt == (fb)->bufsiz) ? ap_bflsbuf(c, (fb)) : \
   		     ((fb)->outbase[(fb)->outcnt++] = (c), 0))
   
   #else /*CHARSET_EBCDIC*/
   
  -#define bgetc(fb)   ( ((fb)->incnt == 0) ? ap_bfilbuf(fb) : \
  +#define ap_bgetc(fb)   ( ((fb)->incnt == 0) ? ap_bfilbuf(fb) : \
   		    ((fb)->incnt--, (fb->flags & B_ASCII2EBCDIC)\
   		    ?os_toebcdic[(unsigned char)*((fb)->inptr++)]:*((fb)->inptr++)) )
   
  -#define bputc(c, fb) ((((fb)->flags & (B_EOUT|B_WRERR|B_WR)) != B_WR || \
  +#define ap_bputc(c, fb) ((((fb)->flags & (B_EOUT|B_WRERR|B_WR)) != B_WR || \
   		     (fb)->outcnt == (fb)->bufsiz) ? ap_bflsbuf(c, (fb)) : \
   		     ((fb)->outbase[(fb)->outcnt++] = (fb->flags & B_EBCDIC2ASCII)\
   		     ?os_toascii[(unsigned char)c]:(c), 0))
  
  
  
  1.29      +4 -4      apache-1.3/src/include/http_log.h
  
  Index: http_log.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/http_log.h,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- http_log.h	1998/04/11 12:00:20	1.28
  +++ http_log.h	1998/04/27 06:59:34	1.29
  @@ -129,11 +129,11 @@
   API_EXPORT(piped_log *) ap_open_piped_log (pool *p, const char *program);
   API_EXPORT(void) ap_close_piped_log (piped_log *);
   #ifndef NO_RELIABLE_PIPED_LOGS
  -#define piped_log_read_fd(pl)	((pl)->fds[0])
  -#define piped_log_write_fd(pl)	((pl)->fds[1])
  +#define ap_piped_log_read_fd(pl)	((pl)->fds[0])
  +#define ap_piped_log_write_fd(pl)	((pl)->fds[1])
   #else
  -#define piped_log_read_fd(pl)	(-1)
  -#define piped_log_write_fd(pl)	(fileno((pl)->write_f))
  +#define ap_piped_log_read_fd(pl)	(-1)
  +#define ap_piped_log_write_fd(pl)	(fileno((pl)->write_f))
   #endif
   
   #endif	/* !APACHE_HTTP_LOG_H */
  
  
  
  1.74      +2 -2      apache-1.3/src/main/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/buff.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- buff.c	1998/04/11 12:00:28	1.73
  +++ buff.c	1998/04/27 06:59:35	1.74
  @@ -87,7 +87,7 @@
    * which can result in a writev().  It's a little more work to set up the
    * writev() rather than copy bytes into the buffer, so we don't do it for small
    * writes.  This is especially important when chunking (which is a very likely
  - * source of small writes if it's a module using bputc/bputs)... because we
  + * source of small writes if it's a module using ap_bputc/ap_bputs)...because we
    * have the expense of actually building two chunks for each writev().
    */
   #ifndef LARGE_WRITE_THRESHOLD
  @@ -394,7 +394,7 @@
   /*
    * Start chunked encoding.
    *
  - * Note that in order for bputc() to be an efficient macro we have to guarantee
  + * Note that in order for ap_bputc() to be an efficient macro we have to guarantee
    * that start_chunk() has always been called on the buffer before we leave any
    * routine in this file.  Said another way, if a routine here uses end_chunk()
    * and writes something on the wire, then it has to call start_chunk() or set
  
  
  
  1.212     +3 -3      apache-1.3/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
  retrieving revision 1.211
  retrieving revision 1.212
  diff -u -r1.211 -r1.212
  --- http_protocol.c	1998/04/11 12:00:30	1.211
  +++ http_protocol.c	1998/04/27 06:59:35	1.212
  @@ -1528,8 +1528,8 @@
       r->remaining -= len_read;
   
       if (r->remaining == 0) {    /* End of chunk, get trailing CRLF */
  -        if ((c = bgetc(r->connection->client)) == CR) {
  -            c = bgetc(r->connection->client);
  +        if ((c = ap_bgetc(r->connection->client)) == CR) {
  +            c = ap_bgetc(r->connection->client);
           }
           if (c != LF) {
               r->connection->keepalive = -1;
  @@ -1815,7 +1815,7 @@
   {
       if (r->connection->aborted)
           return EOF;
  -    bputc(c, r->connection->client);
  +    ap_bputc(c, r->connection->client);
       SET_BYTES_SENT(r);
       return c;
   }
  
  
  
  1.54      +1 -1      apache-1.3/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- mod_log_config.c	1998/04/11 12:00:48	1.53
  +++ mod_log_config.c	1998/04/27 06:59:36	1.54
  @@ -908,7 +908,7 @@
           if (pl == NULL) {
               exit(1);
           }
  -        cls->log_fd = piped_log_write_fd(pl);
  +        cls->log_fd = ap_piped_log_write_fd(pl);
       }
       else {
           char *fname = ap_server_root_relative(p, cls->fname);
  
  
  
  1.6       +2 -2      apache-1.3/src/modules/test/mod_rndchunk.c
  
  Index: mod_rndchunk.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/test/mod_rndchunk.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_rndchunk.c	1998/04/11 12:01:01	1.5
  +++ mod_rndchunk.c	1998/04/27 06:59:37	1.6
  @@ -56,8 +56,8 @@
    */
   
   /*
  - * This module is inteded to be used for testing chunked encoding.  It
  - * generates a whole whack of output using bputc() and bputs().  It
  + * This module is intended to be used for testing chunked encoding.  It
  + * generates a whole whack of output using ap_bputc() and ap_bputs().  It
    * also exercises start_chunk() and end_chunk() in buff.c.  To use it
    * you should use a tool like netcat and the src/test/check_chunked
    * tool.  Add something like this to your access.conf file:
  
  
  

Mime
View raw message