httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: httpd-2.0/server core.c protocol.c request.c scoreboard.c util.c util_script.c
Date Sat, 23 Oct 2004 22:39:54 GMT
fielding    2004/10/23 15:39:54

  Modified:    .        CHANGES
               include  ap_mmn.h http_protocol.h httpd.h scoreboard.h
                        util_script.h
               modules/http http_protocol.c
               server   core.c protocol.c request.c scoreboard.c util.c
                        util_script.c
  Log:
  veto and revert win64 patch: 64bit changes must percolate from the
  bottom (APR/system) up -- we can't give the client a 64bit API and
  then cast it to 32bits internally without introducing security holes
  on other platforms.
  
  Revision  Changes    Path
  1.1619    +0 -3      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1618
  retrieving revision 1.1619
  diff -u -r1.1618 -r1.1619
  --- CHANGES	23 Oct 2004 17:45:54 -0000	1.1618
  +++ CHANGES	23 Oct 2004 22:39:52 -0000	1.1619
  @@ -5,9 +5,6 @@
     *) mod_cache: Add CacheIgnoreHeaders directive.  PR 30399.
        [Rüiger Plü <r.pluem t-online.de>]
   
  -  *) WIN64: API changes to clean up Windows 64bit compile warnings
  -     [Allan Edwards]
  -
     *) mod_rewrite: Removed the MaxRedirects option in favor of the
        core LimitInternalRecursion directive.  [Andr Malo]
   
  
  
  
  1.71      +2 -3      httpd-2.0/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_mmn.h,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- ap_mmn.h	22 Oct 2004 15:22:04 -0000	1.70
  +++ ap_mmn.h	23 Oct 2004 22:39:53 -0000	1.71
  @@ -84,15 +84,14 @@
    *                      changed ap_add_module, ap_add_loaded_module,
    *                      ap_setup_prelinked_modules, ap_process_resource_config
    * 20040425.1 (2.1.0-dev) Added ap_module_symbol_t and ap_prelinked_module_symbols
  - * 20041022   (2.1.0-dev) API changes to clean up 64bit compiles
    */
   
   #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
   
   #ifndef MODULE_MAGIC_NUMBER_MAJOR
  -#define MODULE_MAGIC_NUMBER_MAJOR 20041022
  +#define MODULE_MAGIC_NUMBER_MAJOR 20040425
   #endif
  -#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
  +#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */
   
   /**
    * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
  
  
  
  1.94      +10 -10    httpd-2.0/include/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_protocol.h,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- http_protocol.h	22 Oct 2004 15:22:04 -0000	1.93
  +++ http_protocol.h	23 Oct 2004 22:39:53 -0000	1.94
  @@ -338,9 +338,9 @@
    * @param str The string to output
    * @param r The current request
    * @return The number of bytes sent
  - * @deffunc apr_ssize_t ap_rputs(const char *str, request_rec *r)
  + * @deffunc int ap_rputs(const char *str, request_rec *r)
    */
  -AP_DECLARE(apr_ssize_t) ap_rputs(const char *str, request_rec *r);
  +AP_DECLARE(int) ap_rputs(const char *str, request_rec *r);
   
   /**
    * Write a buffer for the current request
  @@ -357,9 +357,9 @@
    * @param r The current request
    * @param ... The strings to write
    * @return The number of bytes sent
  - * @deffunc apr_ssize_t ap_rvputs(request_rec *r, ...)
  + * @deffunc int ap_rvputs(request_rec *r, ...)
    */
  -AP_DECLARE_NONSTD(apr_ssize_t) ap_rvputs(request_rec *r,...);
  +AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r,...);
   
   /**
    * Output data to the client in a printf format
  @@ -367,9 +367,9 @@
    * @param fmt The format string
    * @param vlist The arguments to use to fill out the format string
    * @return The number of bytes sent
  - * @deffunc apr_ssize_t ap_vrprintf(request_rec *r, const char *fmt, va_list vlist)
  + * @deffunc int ap_vrprintf(request_rec *r, const char *fmt, va_list vlist)
    */
  -AP_DECLARE(apr_ssize_t) ap_vrprintf(request_rec *r, const char *fmt, va_list vlist);
  +AP_DECLARE(int) ap_vrprintf(request_rec *r, const char *fmt, va_list vlist);
   
   /**
    * Output data to the client in a printf format
  @@ -377,9 +377,9 @@
    * @param fmt The format string
    * @param ... The arguments to use to fill out the format string
    * @return The number of bytes sent
  - * @deffunc apr_ssize_t ap_rprintf(request_rec *r, const char *fmt, ...)
  + * @deffunc int ap_rprintf(request_rec *r, const char *fmt, ...)
    */
  -AP_DECLARE_NONSTD(apr_ssize_t) ap_rprintf(request_rec *r, const char *fmt,...)
  +AP_DECLARE_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt,...)
   				__attribute__((format(printf,2,3)));
   /**
    * Flush all of the data for the current request to the client
  @@ -443,9 +443,9 @@
    * @param bufsiz The size of the buffer
    * @return Number of bytes inserted into the buffer.  When done reading, 0
    *         if EOF, or -1 if there was an error
  - * @deffunc apr_ssize_t ap_get_client_block(request_rec *r, char *buffer, apr_size_t bufsiz)
  + * @deffunc long ap_get_client_block(request_rec *r, char *buffer, apr_size_t bufsiz)
    */
  -AP_DECLARE(apr_ssize_t) ap_get_client_block(request_rec *r, char *buffer, apr_size_t bufsiz);
  +AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer, apr_size_t bufsiz);
   
   /**
    * In HTTP/1.1, any method can have a body.  However, most GET handlers
  
  
  
  1.214     +4 -4      httpd-2.0/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/httpd.h,v
  retrieving revision 1.213
  retrieving revision 1.214
  diff -u -r1.213 -r1.214
  --- httpd.h	22 Oct 2004 15:22:04 -0000	1.213
  +++ httpd.h	23 Oct 2004 22:39:53 -0000	1.214
  @@ -1091,7 +1091,7 @@
       /** Pathname for ServerPath */
       const char *path;
       /** Length of path */
  -    apr_size_t pathlen;
  +    int pathlen;
   
       /** Normal names for ServerAlias servers */
       apr_array_header_t *names;
  @@ -1244,7 +1244,7 @@
    * address of field is shifted to the next non-comma, non-whitespace 
    * character.  len is the length of the item excluding any beginning whitespace.
    */
  -AP_DECLARE(const char *) ap_size_list_item(const char **field, apr_size_t *len);
  +AP_DECLARE(const char *) ap_size_list_item(const char **field, int *len);
   
   /**
    * Retrieve an HTTP header field list item, as separated by a comma,
  @@ -1587,7 +1587,7 @@
    * @param c The character to search for
    * @return The index of the first occurrence of c in str
    */
  -AP_DECLARE(apr_ssize_t) ap_ind(const char *str, char c);	/* Sigh... */
  +AP_DECLARE(int) ap_ind(const char *str, char c);	/* Sigh... */
   
   /**
    * Search a string from right to left for the first occurrence of a 
  @@ -1596,7 +1596,7 @@
    * @param c The character to search for
    * @return The index of the first occurrence of c in str
    */
  -AP_DECLARE(apr_ssize_t) ap_rind(const char *str, char c);
  +AP_DECLARE(int) ap_rind(const char *str, char c);
   
   /**
    * Given a string, replace any bare " with \" .
  
  
  
  1.56      +1 -1      httpd-2.0/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/scoreboard.h,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- scoreboard.h	22 Oct 2004 15:22:04 -0000	1.55
  +++ scoreboard.h	23 Oct 2004 22:39:53 -0000	1.56
  @@ -164,7 +164,7 @@
   int ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e t);
   apr_status_t ap_reopen_scoreboard(apr_pool_t *p, apr_shm_t **shm, int detached);
   void ap_init_scoreboard(void *shared_score);
  -AP_DECLARE(apr_size_t) ap_calc_scoreboard_size(void);
  +AP_DECLARE(int) ap_calc_scoreboard_size(void);
   apr_status_t ap_cleanup_scoreboard(void *d);
   
   AP_DECLARE(void) ap_create_sb_handle(ap_sb_handle_t **new_sbh, apr_pool_t *p,
  
  
  
  1.25      +2 -2      httpd-2.0/include/util_script.h
  
  Index: util_script.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/util_script.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- util_script.h	22 Oct 2004 15:22:04 -0000	1.24
  +++ util_script.h	23 Oct 2004 22:39:53 -0000	1.25
  @@ -53,7 +53,7 @@
    * @return The length of the path info
    * @deffunc int ap_find_path_info(const char *uri, const char *path_info)
    */
  -AP_DECLARE(apr_size_t) ap_find_path_info(const char *uri, const char *path_info);
  +AP_DECLARE(int) ap_find_path_info(const char *uri, const char *path_info);
   
   /**
    * Add CGI environment variables required by HTTP/1.1 to the request's 
  @@ -131,7 +131,7 @@
    * @deffunc int ap_scan_script_header_err_core(request_rec *r, char *buffer, int (*getsfunc)(char
*, int, void *), void *getsfunc_data)
    */ 
   AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
  -				       int (*getsfunc) (char *, apr_size_t, void *),
  +				       int (*getsfunc) (char *, int, void *),
   				       void *getsfunc_data);
   
   #ifdef __cplusplus
  
  
  
  1.486     +2 -2      httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.485
  retrieving revision 1.486
  diff -u -r1.485 -r1.486
  --- http_protocol.c	22 Oct 2004 15:22:04 -0000	1.485
  +++ http_protocol.c	23 Oct 2004 22:39:53 -0000	1.486
  @@ -662,7 +662,7 @@
    */
   AP_DECLARE(int) ap_method_number_of(const char *method)
   {
  -    apr_size_t len = strlen(method);
  +    int len = strlen(method);
       int which = lookup_builtin_method(method, len);
   
       if (which != UNKNOWN_METHOD)
  @@ -1858,7 +1858,7 @@
    * Returns 0 on End-of-body, -1 on error or premature chunk end.
    *
    */
  -AP_DECLARE(apr_ssize_t) ap_get_client_block(request_rec *r, char *buffer,
  +AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer,
                                        apr_size_t bufsiz)
   {
       apr_status_t rv;
  
  
  
  1.289     +7 -10     httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.288
  retrieving revision 1.289
  diff -u -r1.288 -r1.289
  --- core.c	22 Oct 2004 15:22:04 -0000	1.288
  +++ core.c	23 Oct 2004 22:39:53 -0000	1.289
  @@ -2298,7 +2298,7 @@
       }
   
       cmd->server->path = arg;
  -    cmd->server->pathlen = strlen(arg);
  +    cmd->server->pathlen = (int)strlen(arg);
       return NULL;
   }
   
  @@ -3009,20 +3009,19 @@
   }
   
   static apr_status_t writev_it_all(apr_socket_t *s,
  -                                  struct iovec *vec, apr_size_t nvec,
  +                                  struct iovec *vec, int nvec,
                                     apr_size_t len, apr_size_t *nbytes)
   {
       apr_size_t bytes_written = 0;
       apr_status_t rv;
       apr_size_t n = len;
  -    apr_size_t i = 0;
  +    int i = 0;
   
       *nbytes = 0;
   
       /* XXX handle checking for non-blocking socket */
       while (bytes_written != len) {
  -        /* Cast to eliminate 64 bit warning */
  -        rv = apr_socket_sendv(s, vec + i, (apr_int32_t)(nvec - i), &n);
  +        rv = apr_socket_sendv(s, vec + i, nvec - i, &n);
           *nbytes += n;
           bytes_written += n;
           if (rv != APR_SUCCESS)
  @@ -3794,7 +3793,7 @@
       core_net_rec *net = f->ctx;
       core_ctx_t *ctx = net->in_ctx;
       const char *str;
  -    apr_ssize_t len;
  +    apr_size_t len;
   
       if (mode == AP_MODE_INIT) {
           /*
  @@ -4289,14 +4288,12 @@
   
               memset(&hdtr, '\0', sizeof(hdtr));
               if (nvec) {
  -                /* Cast to eliminate 64 bit warning */
  -                hdtr.numheaders = (int)nvec;
  +                hdtr.numheaders = nvec;
                   hdtr.headers = vec;
               }
   
               if (nvec_trailers) {
  -                /* Cast to eliminate 64 bit warning */
  -                hdtr.numtrailers = (int)nvec_trailers;
  +                hdtr.numtrailers = nvec_trailers;
                   hdtr.trailers = vec_trailers;
               }
   
  
  
  
  1.155     +7 -7      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- protocol.c	22 Oct 2004 15:22:05 -0000	1.154
  +++ protocol.c	23 Oct 2004 22:39:53 -0000	1.155
  @@ -1387,7 +1387,7 @@
       return c;
   }
   
  -AP_DECLARE(apr_ssize_t) ap_rputs(const char *str, request_rec *r)
  +AP_DECLARE(int) ap_rputs(const char *str, request_rec *r)
   {
       apr_size_t len;
   
  @@ -1441,9 +1441,9 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(apr_ssize_t) ap_vrprintf(request_rec *r, const char *fmt, va_list va)
  +AP_DECLARE(int) ap_vrprintf(request_rec *r, const char *fmt, va_list va)
   {
  -    apr_ssize_t written;
  +    apr_size_t written;
       struct ap_vrprintf_data vd;
       char vrprintf_buf[AP_IOBUFSIZE];
   
  @@ -1461,7 +1461,7 @@
       *(vd.vbuff.curpos) = '\0';
   
       if (written != -1) {
  -        apr_size_t n = vd.vbuff.curpos - vrprintf_buf;
  +        int n = vd.vbuff.curpos - vrprintf_buf;
   
           /* last call to buffer_output, to finish clearing the buffer */
           if (buffer_output(r, vrprintf_buf,n) != APR_SUCCESS)
  @@ -1473,10 +1473,10 @@
       return written;
   }
   
  -AP_DECLARE_NONSTD(apr_ssize_t) ap_rprintf(request_rec *r, const char *fmt, ...)
  +AP_DECLARE_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt, ...)
   {
       va_list va;
  -    apr_ssize_t n;
  +    int n;
   
       if (r->connection->aborted)
           return -1;
  @@ -1488,7 +1488,7 @@
       return n;
   }
   
  -AP_DECLARE_NONSTD(apr_ssize_t) ap_rvputs(request_rec *r, ...)
  +AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r, ...)
   {
       va_list va;
       const char *s;
  
  
  
  1.140     +1 -2      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- request.c	22 Oct 2004 15:22:05 -0000	1.139
  +++ request.c	23 Oct 2004 22:39:53 -0000	1.140
  @@ -1213,8 +1213,7 @@
           /* We start now_merged from NULL since we want to build
            * a locations list that can be merged to any vhost.
            */
  -        apr_size_t len;
  -        int sec_idx;
  +        int len, sec_idx;
           int matches = cache->walked->nelts;
           walk_walked_t *last_walk = (walk_walked_t*)cache->walked->elts;
           cache->cached = entry_uri;
  
  
  
  1.79      +1 -1      httpd-2.0/server/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- scoreboard.c	22 Oct 2004 15:22:05 -0000	1.78
  +++ scoreboard.c	23 Oct 2004 22:39:53 -0000	1.79
  @@ -88,7 +88,7 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(apr_size_t) ap_calc_scoreboard_size(void)
  +AP_DECLARE(int) ap_calc_scoreboard_size(void)
   {
       ap_mpm_query(AP_MPMQ_HARD_LIMIT_THREADS, &thread_limit);
       ap_mpm_query(AP_MPMQ_HARD_LIMIT_DAEMONS, &server_limit);
  
  
  
  1.152     +19 -26    httpd-2.0/server/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util.c,v
  retrieving revision 1.151
  retrieving revision 1.152
  diff -u -r1.151 -r1.152
  --- util.c	22 Oct 2004 15:22:05 -0000	1.151
  +++ util.c	23 Oct 2004 22:39:53 -0000	1.152
  @@ -451,7 +451,7 @@
   AP_DECLARE(void) ap_getparents(char *name)
   {
       char *next;
  -    apr_ssize_t l, w, first_dot;
  +    int l, w, first_dot;
   
       /* Four paseses, as per RFC 1808 */
       /* a) remove ./ path segments */
  @@ -480,7 +480,7 @@
       while (name[l] != '\0') {
           if (name[l] == '.' && name[l + 1] == '.' && IS_SLASH(name[l + 2])
               && (l == 0 || IS_SLASH(name[l - 1]))) {
  -            register apr_ssize_t m = l + 3, n;
  +            register int m = l + 3, n;
   
               l = l - 2;
               if (l >= 0) {
  @@ -592,7 +592,7 @@
   {
       const char *last_slash = ap_strrchr_c(s, '/');
       char *d;
  -    apr_size_t l;
  +    int l;
   
       if (last_slash == NULL) {
           return apr_pstrdup(p, "");
  @@ -623,7 +623,7 @@
   AP_DECLARE(char *) ap_getword(apr_pool_t *atrans, const char **line, char stop)
   {
       const char *pos = *line;
  -    apr_size_t len;
  +    int len;
       char *res;
   
       while ((*pos != stop) && *pos) {
  @@ -653,7 +653,7 @@
   AP_DECLARE(char *) ap_getword_white(apr_pool_t *atrans, const char **line)
   {
       const char *pos = *line;
  -    apr_size_t len;
  +    int len;
       char *res;
   
       while (!apr_isspace(*pos) && *pos) {
  @@ -705,12 +705,12 @@
    * all honored
    */
   
  -static char *substring_conf(apr_pool_t *p, const char *start, apr_size_t len,
  +static char *substring_conf(apr_pool_t *p, const char *start, int len,
                               char quote)
   {
       char *result = apr_palloc(p, len + 2);
       char *resp = result;
  -    apr_size_t i;
  +    int i;
   
       for (i = 0; i < len; ++i) {
           if (start[i] == '\\' && (start[i + 1] == '\\'
  @@ -887,13 +887,11 @@
       return (int)EOF;
   }
   
  -static void *cfg_getstr(void *buf, apr_size_t bufsiz, void *param)
  +static void *cfg_getstr(void *buf, size_t bufsiz, void *param)
   {
       apr_file_t *cfp = (apr_file_t *) param;
       apr_status_t rv;
  -
  -    /* Cast to eliminate 64 bit warning */
  -    rv = apr_file_gets(buf, (int)bufsiz, cfp);
  +    rv = apr_file_gets(buf, bufsiz, cfp);
       if (rv == APR_SUCCESS) {
           return buf;
       }
  @@ -973,7 +971,7 @@
       new_cfg->param = file;
       new_cfg->name = apr_pstrdup(p, name);
       new_cfg->getch = (int (*)(void *)) cfg_getch;
  -    new_cfg->getstr = (void *(*)(void *, apr_size_t, void *)) cfg_getstr;
  +    new_cfg->getstr = (void *(*)(void *, size_t, void *)) cfg_getstr;
       new_cfg->close = (int (*)(void *)) cfg_close;
       new_cfg->line_number = 0;
       *ret_cfg = new_cfg;
  @@ -1154,7 +1152,7 @@
    * of field is shifted to the next non-comma, non-whitespace character.
    * len is the length of the item excluding any beginning whitespace.
    */
  -AP_DECLARE(const char *) ap_size_list_item(const char **field, apr_size_t *len)
  +AP_DECLARE(const char *) ap_size_list_item(const char **field, int *len)
   {
       const unsigned char *ptr = (const unsigned char *)*field;
       const unsigned char *token;
  @@ -1220,8 +1218,7 @@
       const unsigned char *ptr;
       unsigned char *pos;
       char *token;
  -    int addspace = 0, in_qpair = 0, in_qstr = 0, in_com = 0;
  -    apr_size_t tok_len = 0;
  +    int addspace = 0, in_qpair = 0, in_qstr = 0, in_com = 0, tok_len = 0;
   
       /* Find the beginning and maximum length of the list item so that
        * we can allocate a buffer for the new string and reset the field.
  @@ -1414,7 +1411,7 @@
       const char *ptr = *accept_line;
       const char *tok_start;
       char *token;
  -    apr_size_t tok_len;
  +    int tok_len;
   
       /* Find first non-white byte */
   
  @@ -1487,8 +1484,7 @@
   AP_DECLARE(int) ap_find_last_token(apr_pool_t *p, const char *line,
                                      const char *tok)
   {
  -    apr_size_t llen, tlen;
  -    apr_ssize_t lidx;
  +    int llen, tlen, lidx;
   
       if (!line)
           return 0;
  @@ -1973,7 +1969,7 @@
       return (x ? 1 : 0);                /* If the first character is ':', it's broken, too
*/
   }
   
  -AP_DECLARE(apr_ssize_t) ap_ind(const char *s, char c)
  +AP_DECLARE(int) ap_ind(const char *s, char c)
   {
       const char *p = ap_strchr_c(s, c);
   
  @@ -1982,7 +1978,7 @@
       return p - s;
   }
   
  -AP_DECLARE(apr_ssize_t) ap_rind(const char *s, char c)
  +AP_DECLARE(int) ap_rind(const char *s, char c)
   {
       const char *p = ap_strrchr_c(s, c);
   
  @@ -2083,13 +2079,10 @@
   AP_DECLARE(char *) ap_pbase64encode(apr_pool_t *p, char *string) 
   { 
       char *encoded;
  -    apr_size_t l = strlen(string);
  -
  -    /* Cast to eliminate 64 bit warning */
  -    encoded = (char *) apr_palloc(p, 1 + apr_base64_encode_len((int)l));
  +    int l = strlen(string);
   
  -    /* Cast to eliminate 64 bit warning */
  -    l = apr_base64_encode(encoded, string, (int)l);
  +    encoded = (char *) apr_palloc(p, 1 + apr_base64_encode_len(l));
  +    l = apr_base64_encode(encoded, string, l);
       encoded[l] = '\0'; /* make binary sequence into string */
   
       return encoded;
  
  
  
  1.93      +12 -13    httpd-2.0/server/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_script.c,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- util_script.c	22 Oct 2004 15:22:05 -0000	1.92
  +++ util_script.c	23 Oct 2004 22:39:53 -0000	1.93
  @@ -283,10 +283,10 @@
    * and find as much of the two that match as possible.
    */
   
  -AP_DECLARE(apr_size_t) ap_find_path_info(const char *uri, const char *path_info)
  +AP_DECLARE(int) ap_find_path_info(const char *uri, const char *path_info)
   {
  -    apr_ssize_t lu = strlen(uri);
  -    apr_size_t lp = strlen(path_info);
  +    int lu = strlen(uri);
  +    int lp = strlen(path_info);
   
       while (lu-- && lp-- && uri[lu] == path_info[lp]);
   
  @@ -354,7 +354,7 @@
           apr_table_setn(e, "SCRIPT_NAME", r->uri);
       }
       else {
  -        apr_size_t path_info_start = ap_find_path_info(r->uri, r->path_info);
  +        int path_info_start = ap_find_path_info(r->uri, r->path_info);
   
           apr_table_setn(e, "SCRIPT_NAME",
                         apr_pstrndup(r->pool, r->uri, path_info_start));
  @@ -394,12 +394,12 @@
   }
   
   AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
  -                                       int (*getsfunc) (char *, apr_size_t, void *),
  +                                       int (*getsfunc) (char *, int, void *),
                                          void *getsfunc_data)
   {
       char x[MAX_STRING_LEN];
       char *w, *l;
  -    apr_size_t p;
  +    int p;
       int cgi_status = HTTP_OK;
       apr_table_t *merge;
       apr_table_t *cookie_table;
  @@ -581,10 +581,9 @@
       return OK;
   }
   
  -static int getsfunc_FILE(char *buf, apr_size_t len, void *f)
  +static int getsfunc_FILE(char *buf, int len, void *f)
   {
  -    /* Cast to eliminate 64 bit warning */
  -    return apr_file_gets(buf, (int)len, (apr_file_t *) f) == APR_SUCCESS;
  +    return apr_file_gets(buf, len, (apr_file_t *) f) == APR_SUCCESS;
   }
   
   AP_DECLARE(int) ap_scan_script_header_err(request_rec *r, apr_file_t *f,
  @@ -593,7 +592,7 @@
       return ap_scan_script_header_err_core(r, buffer, getsfunc_FILE, f);
   }
   
  -static int getsfunc_BRIGADE(char *buf, apr_size_t len, void *arg)
  +static int getsfunc_BRIGADE(char *buf, int len, void *arg)
   {
       apr_bucket_brigade *bb = (apr_bucket_brigade *)arg;
       const char *dst_end = buf + len - 1; /* leave room for terminating null */
  @@ -651,11 +650,11 @@
       const char *curpos;
   };
   
  -static int getsfunc_STRING(char *w, apr_size_t len, void *pvastrs)
  +static int getsfunc_STRING(char *w, int len, void *pvastrs)
   {
       struct vastrs *strs = (struct vastrs*) pvastrs;
       const char *p;
  -    apr_size_t t;
  +    int t;
       
       if (!strs->curpos || !*strs->curpos) 
           return 0;
  @@ -675,7 +674,7 @@
       }
       else
           strs->curpos += t;
  -    return (int)t;    
  +    return t;    
   }
   
   /* ap_scan_script_header_err_strs() accepts additional const char* args...
  
  
  

Mime
View raw message