[Remove entries to the current 2.0 section below, when backported]
+ *) WIN64: API changes to clean up Windows 64bit compile warnings
+ [Allan Edwards]
+
*) mod_cache: CacheDisable will only disable the URLs it was meant to
disable, not all caching. PR 31128.
[Edward Rudd <eddie omegaware.com>, Paul Querna]
* 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 20040425
+#define MODULE_MAGIC_NUMBER_MAJOR 20041022
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
* @param str The string to output
* @param r The current request
* @return The number of bytes sent
- * @deffunc int ap_rputs(const char *str, request_rec *r)
+ * @deffunc apr_ssize_t ap_rputs(const char *str, request_rec *r)
*/
-AP_DECLARE(int) ap_rputs(const char *str, request_rec *r);
+AP_DECLARE(apr_ssize_t) ap_rputs(const char *str, request_rec *r);
/**
* Write a buffer for the current request
* @param r The current request
* @param ... The strings to write
* @return The number of bytes sent
- * @deffunc int ap_rvputs(request_rec *r, ...)
+ * @deffunc apr_ssize_t ap_rvputs(request_rec *r, ...)
*/
-AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r,...);
+AP_DECLARE_NONSTD(apr_ssize_t) ap_rvputs(request_rec *r,...);
/**
* Output data to the client in a printf format
* @param fmt The format string
* @param vlist The arguments to use to fill out the format string
* @return The number of bytes sent
- * @deffunc int ap_vrprintf(request_rec *r, const char *fmt, va_list vlist)
+ * @deffunc 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);
+AP_DECLARE(apr_ssize_t) ap_vrprintf(request_rec *r, const char *fmt, va_list vlist);
/**
* Output data to the client in a printf format
* @param fmt The format string
* @param ... The arguments to use to fill out the format string
* @return The number of bytes sent
- * @deffunc int ap_rprintf(request_rec *r, const char *fmt, ...)
+ * @deffunc apr_ssize_t ap_rprintf(request_rec *r, const char *fmt, ...)
*/
-AP_DECLARE_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt,...)
+AP_DECLARE_NONSTD(apr_ssize_t) 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
* @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 long ap_get_client_block(request_rec *r, char *buffer, apr_size_t bufsiz)
+ * @deffunc 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);
+AP_DECLARE(apr_ssize_t) 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
/** Pathname for ServerPath */
const char *path;
/** Length of path */
- int pathlen;
+ apr_size_t pathlen;
/** Normal names for ServerAlias servers */
apr_array_header_t *names;
* 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, int *len);
+AP_DECLARE(const char *) ap_size_list_item(const char **field, apr_size_t *len);
/**
* Retrieve an HTTP header field list item, as separated by a comma,
* @param c The character to search for
* @return The index of the first occurrence of c in str
*/
-AP_DECLARE(int) ap_ind(const char *str, char c); /* Sigh... */
+AP_DECLARE(apr_ssize_t) ap_ind(const char *str, char c); /* Sigh... */
/**
* Search a string from right to left for the first occurrence of a
* @param c The character to search for
* @return The index of the first occurrence of c in str
*/
-AP_DECLARE(int) ap_rind(const char *str, char c);
+AP_DECLARE(apr_ssize_t) ap_rind(const char *str, char c);
/**
* Given a string, replace any bare " with \" .
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(int) ap_calc_scoreboard_size(void);
+AP_DECLARE(apr_size_t) 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,
* @return The length of the path info
* @deffunc int 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);
+AP_DECLARE(apr_size_t) ap_find_path_info(const char *uri, const char *path_info);
/**
* Add CGI environment variables required by HTTP/1.1 to the request's
* @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 *, int, void *),
+ int (*getsfunc) (char *, apr_size_t, void *),
void *getsfunc_data);
#ifdef __cplusplus
*/
AP_DECLARE(int) ap_method_number_of(const char *method)
{
- int len = strlen(method);
+ apr_size_t len = strlen(method);
int which = lookup_builtin_method(method, len);
if (which != UNKNOWN_METHOD)
* Returns 0 on End-of-body, -1 on error or premature chunk end.
*
*/
-AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer,
+AP_DECLARE(apr_ssize_t) ap_get_client_block(request_rec *r, char *buffer,
apr_size_t bufsiz)
{
apr_status_t rv;
}
cmd->server->path = arg;
- cmd->server->pathlen = (int)strlen(arg);
+ cmd->server->pathlen = strlen(arg);
return NULL;
}
}
static apr_status_t writev_it_all(apr_socket_t *s,
- struct iovec *vec, int nvec,
+ struct iovec *vec, apr_size_t nvec,
apr_size_t len, apr_size_t *nbytes)
{
apr_size_t bytes_written = 0;
apr_status_t rv;
apr_size_t n = len;
- int i = 0;
+ apr_size_t i = 0;
*nbytes = 0;
/* XXX handle checking for non-blocking socket */
while (bytes_written != len) {
- rv = apr_socket_sendv(s, vec + i, nvec - i, &n);
+ /* Cast to eliminate 64 bit warning */
+ rv = apr_socket_sendv(s, vec + i, (apr_int32_t)(nvec - i), &n);
*nbytes += n;
bytes_written += n;
if (rv != APR_SUCCESS)
core_net_rec *net = f->ctx;
core_ctx_t *ctx = net->in_ctx;
const char *str;
- apr_size_t len;
+ apr_ssize_t len;
if (mode == AP_MODE_INIT) {
/*
memset(&hdtr, '\0', sizeof(hdtr));
if (nvec) {
- hdtr.numheaders = nvec;
+ /* Cast to eliminate 64 bit warning */
+ hdtr.numheaders = (int)nvec;
hdtr.headers = vec;
}
if (nvec_trailers) {
- hdtr.numtrailers = nvec_trailers;
+ /* Cast to eliminate 64 bit warning */
+ hdtr.numtrailers = (int)nvec_trailers;
hdtr.trailers = vec_trailers;
}
return c;
}
-AP_DECLARE(int) ap_rputs(const char *str, request_rec *r)
+AP_DECLARE(apr_ssize_t) ap_rputs(const char *str, request_rec *r)
{
apr_size_t len;
return APR_SUCCESS;
}
-AP_DECLARE(int) ap_vrprintf(request_rec *r, const char *fmt, va_list va)
+AP_DECLARE(apr_ssize_t) ap_vrprintf(request_rec *r, const char *fmt, va_list va)
{
- apr_size_t written;
+ apr_ssize_t written;
struct ap_vrprintf_data vd;
char vrprintf_buf[AP_IOBUFSIZE];
*(vd.vbuff.curpos) = '\0';
if (written != -1) {
- int n = vd.vbuff.curpos - vrprintf_buf;
+ apr_size_t 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)
return written;
}
-AP_DECLARE_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt, ...)
+AP_DECLARE_NONSTD(apr_ssize_t) ap_rprintf(request_rec *r, const char *fmt, ...)
{
va_list va;
- int n;
+ apr_ssize_t n;
if (r->connection->aborted)
return -1;
return n;
}
-AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r, ...)
+AP_DECLARE_NONSTD(apr_ssize_t) ap_rvputs(request_rec *r, ...)
{
va_list va;
const char *s;
/* We start now_merged from NULL since we want to build
* a locations list that can be merged to any vhost.
*/
- int len, sec_idx;
+ apr_size_t len;
+ int sec_idx;
int matches = cache->walked->nelts;
walk_walked_t *last_walk = (walk_walked_t*)cache->walked->elts;
cache->cached = entry_uri;
return APR_SUCCESS;
}
-AP_DECLARE(int) ap_calc_scoreboard_size(void)
+AP_DECLARE(apr_size_t) 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);
AP_DECLARE(void) ap_getparents(char *name)
{
char *next;
- int l, w, first_dot;
+ apr_ssize_t l, w, first_dot;
/* Four paseses, as per RFC 1808 */
/* a) remove ./ path segments */
while (name[l] != '\0') {
if (name[l] == '.' && name[l + 1] == '.' && IS_SLASH(name[l + 2])
&& (l == 0 || IS_SLASH(name[l - 1]))) {
- register int m = l + 3, n;
+ register apr_ssize_t m = l + 3, n;
l = l - 2;
if (l >= 0) {
{
const char *last_slash = ap_strrchr_c(s, '/');
char *d;
- int l;
+ apr_size_t l;
if (last_slash == NULL) {
return apr_pstrdup(p, "");
AP_DECLARE(char *) ap_getword(apr_pool_t *atrans, const char **line, char stop)
{
const char *pos = *line;
- int len;
+ apr_size_t len;
char *res;
while ((*pos != stop) && *pos) {
AP_DECLARE(char *) ap_getword_white(apr_pool_t *atrans, const char **line)
{
const char *pos = *line;
- int len;
+ apr_size_t len;
char *res;
while (!apr_isspace(*pos) && *pos) {
* all honored
*/
-static char *substring_conf(apr_pool_t *p, const char *start, int len,
+static char *substring_conf(apr_pool_t *p, const char *start, apr_size_t len,
char quote)
{
char *result = apr_palloc(p, len + 2);
char *resp = result;
- int i;
+ apr_size_t i;
for (i = 0; i < len; ++i) {
if (start[i] == '\\' && (start[i + 1] == '\\'
return (int)EOF;
}
-static void *cfg_getstr(void *buf, size_t bufsiz, void *param)
+static void *cfg_getstr(void *buf, apr_size_t bufsiz, void *param)
{
apr_file_t *cfp = (apr_file_t *) param;
apr_status_t rv;
- rv = apr_file_gets(buf, bufsiz, cfp);
+
+ /* Cast to eliminate 64 bit warning */
+ rv = apr_file_gets(buf, (int)bufsiz, cfp);
if (rv == APR_SUCCESS) {
return buf;
}
new_cfg->param = file;
new_cfg->name = apr_pstrdup(p, name);
new_cfg->getch = (int (*)(void *)) cfg_getch;
- new_cfg->getstr = (void *(*)(void *, size_t, void *)) cfg_getstr;
+ new_cfg->getstr = (void *(*)(void *, apr_size_t, void *)) cfg_getstr;
new_cfg->close = (int (*)(void *)) cfg_close;
new_cfg->line_number = 0;
*ret_cfg = new_cfg;
* 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, int *len)
+AP_DECLARE(const char *) ap_size_list_item(const char **field, apr_size_t *len)
{
const unsigned char *ptr = (const unsigned char *)*field;
const unsigned char *token;
const unsigned char *ptr;
unsigned char *pos;
char *token;
- int addspace = 0, in_qpair = 0, in_qstr = 0, in_com = 0, tok_len = 0;
+ int addspace = 0, in_qpair = 0, in_qstr = 0, in_com = 0;
+ apr_size_t 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.
const char *ptr = *accept_line;
const char *tok_start;
char *token;
- int tok_len;
+ apr_size_t tok_len;
/* Find first non-white byte */
AP_DECLARE(int) ap_find_last_token(apr_pool_t *p, const char *line,
const char *tok)
{
- int llen, tlen, lidx;
+ apr_size_t llen, tlen;
+ apr_ssize_t lidx;
if (!line)
return 0;
return (x ? 1 : 0); /* If the first character is ':', it's broken, too */
}
-AP_DECLARE(int) ap_ind(const char *s, char c)
+AP_DECLARE(apr_ssize_t) ap_ind(const char *s, char c)
{
const char *p = ap_strchr_c(s, c);
return p - s;
}
-AP_DECLARE(int) ap_rind(const char *s, char c)
+AP_DECLARE(apr_ssize_t) ap_rind(const char *s, char c)
{
const char *p = ap_strrchr_c(s, c);
AP_DECLARE(char *) ap_pbase64encode(apr_pool_t *p, char *string)
{
char *encoded;
- int l = strlen(string);
+ apr_size_t l = strlen(string);
+
+ /* Cast to eliminate 64 bit warning */
+ encoded = (char *) apr_palloc(p, 1 + apr_base64_encode_len((int)l));
- encoded = (char *) apr_palloc(p, 1 + apr_base64_encode_len(l));
- l = apr_base64_encode(encoded, string, l);
+ /* Cast to eliminate 64 bit warning */
+ l = apr_base64_encode(encoded, string, (int)l);
encoded[l] = '\0'; /* make binary sequence into string */
return encoded;
* and find as much of the two that match as possible.
*/
-AP_DECLARE(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)
{
- int lu = strlen(uri);
- int lp = strlen(path_info);
+ apr_ssize_t lu = strlen(uri);
+ apr_size_t lp = strlen(path_info);
while (lu-- && lp-- && uri[lu] == path_info[lp]);
apr_table_setn(e, "SCRIPT_NAME", r->uri);
}
else {
- int path_info_start = ap_find_path_info(r->uri, r->path_info);
+ apr_size_t 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));
}
AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
- int (*getsfunc) (char *, int, void *),
+ int (*getsfunc) (char *, apr_size_t, void *),
void *getsfunc_data)
{
char x[MAX_STRING_LEN];
char *w, *l;
- int p;
+ apr_size_t p;
int cgi_status = HTTP_OK;
apr_table_t *merge;
apr_table_t *cookie_table;
return OK;
}
-static int getsfunc_FILE(char *buf, int len, void *f)
+static int getsfunc_FILE(char *buf, apr_size_t len, void *f)
{
- return apr_file_gets(buf, len, (apr_file_t *) f) == APR_SUCCESS;
+ /* Cast to eliminate 64 bit warning */
+ return apr_file_gets(buf, (int)len, (apr_file_t *) f) == APR_SUCCESS;
}
AP_DECLARE(int) ap_scan_script_header_err(request_rec *r, apr_file_t *f,
return ap_scan_script_header_err_core(r, buffer, getsfunc_FILE, f);
}
-static int getsfunc_BRIGADE(char *buf, int len, void *arg)
+static int getsfunc_BRIGADE(char *buf, apr_size_t len, void *arg)
{
apr_bucket_brigade *bb = (apr_bucket_brigade *)arg;
const char *dst_end = buf + len - 1; /* leave room for terminating null */
const char *curpos;
};
-static int getsfunc_STRING(char *w, int len, void *pvastrs)
+static int getsfunc_STRING(char *w, apr_size_t len, void *pvastrs)
{
struct vastrs *strs = (struct vastrs*) pvastrs;
const char *p;
- int t;
+ apr_size_t t;
if (!strs->curpos || !*strs->curpos)
return 0;
}
else
strs->curpos += t;
- return t;
+ return (int)t;
}
/* ap_scan_script_header_err_strs() accepts additional const char* args...