Commit ffe347c9 authored by Roy T. Fielding's avatar Roy T. Fielding
Browse files

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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105572 13f79535-47bb-0310-9956-ffa450edef68
parent b1e987d7

CHANGES

+0 −3
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ Changes with Apache 2.1.0-dev 
  *) 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]















































include/ap_mmn.h



+2
−3






























Original line number
Diff line number
Diff line








@@ -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

































include/http_protocol.h



+10
−10






























Original line number
Diff line number
Diff line








@@ -338,9 +338,9 @@ AP_DECLARE(int) ap_rputc(int c, request_rec *r);













 * @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 @@ AP_DECLARE(int) ap_rwrite(const void *buf, int nbyte, request_rec *r);













 * @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 @@ AP_DECLARE_NONSTD(apr_ssize_t) ap_rvputs(request_rec *r,...);













 * @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 @@ AP_DECLARE(apr_ssize_t) ap_vrprintf(request_rec *r, const char *fmt, va_list vli













 * @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 @@ AP_DECLARE(int) ap_should_client_block(request_rec *r);













 * @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

































include/httpd.h



+4
−4






























Original line number
Diff line number
Diff line








@@ -1091,7 +1091,7 @@ struct server_rec {













    /** 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 @@ AP_DECLARE(const char *) ap_resolve_env(apr_pool_t *p, const char * word);













 * 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 @@ AP_DECLARE(void) ap_str_tolower(char *s);













 * @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 @@ AP_DECLARE(apr_ssize_t) ap_ind(const char *str, char c);	/* Sigh... */













 * @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 \" .

































include/scoreboard.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -164,7 +164,7 @@ AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t *sbh, request_rec *r);













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,