You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/10/09 21:03:28 UTC
cvs commit: apache-2.0/src/modules/standard mod_cgid.c
rbb 00/10/09 12:03:28
Modified: src CHANGES
src/lib/apr/misc/unix getuuid.c
src/main http_core.c http_protocol.c
src/modules/standard mod_cgid.c
Log:
Fix some types in the latest tree, so that AIX builds cleanly again.
Submitted by: Victor J. Orlikowski <v....@gte.net>
Reviewed by: Ryan Bloom
Revision Changes Path
1.264 +3 -0 apache-2.0/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- CHANGES 2000/10/09 16:38:28 1.263
+++ CHANGES 2000/10/09 19:03:19 1.264
@@ -1,4 +1,7 @@
Changes with Apache 2.0a8
+ *) Fix a couple of type fixes to allow compilation on AIX again
+ [Victor J. Orlikowski <v....@gte.net>]
+
*) Fix bug in send_the_file() which causes offset to be ignored
if there are no headers to send.
[Bill Stoddard]
1.4 +2 -2 apache-2.0/src/lib/apr/misc/unix/getuuid.c
Index: getuuid.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/getuuid.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- getuuid.c 2000/10/08 02:13:58 1.3
+++ getuuid.c 2000/10/09 19:03:20 1.4
@@ -73,7 +73,7 @@
#define NODE_LENGTH 6
static int uuid_state_seqnum;
-static char uuid_state_node[NODE_LENGTH] = { 0 };
+static unsigned char uuid_state_node[NODE_LENGTH] = { 0 };
static void get_random_info(unsigned char node[NODE_LENGTH])
@@ -114,7 +114,7 @@
system-dependent call to get IEEE node ID. This is also more secure:
we aren't passing out our MAC address.
*/
-static void get_pseudo_node_identifier(char *node)
+static void get_pseudo_node_identifier(unsigned char *node)
{
get_random_info(node);
node[0] |= 0x80; /* this designates a random node ID */
1.155 +2 -3 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- http_core.c 2000/10/09 18:02:45 1.154
+++ http_core.c 2000/10/09 19:03:23 1.155
@@ -2541,7 +2541,7 @@
#endif
static apr_status_t writev_it_all(apr_socket_t *s, struct iovec *vec, int nvec,
- apr_size_t len, apr_ssize_t *nbytes)
+ apr_size_t len, apr_size_t *nbytes)
{
apr_size_t bytes_written = 0;
apr_status_t rv;
@@ -3274,8 +3274,7 @@
*/
#define ASCII_LF '\012'
char *buff;
- apr_size_t length = HUGE_STRING_LEN;
- apr_size_t templen;
+ apr_ssize_t length = HUGE_STRING_LEN, templen;
apr_socket_t *csock = NULL;
apr_status_t rv;
ap_bucket *e;
1.154 +2 -2 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- http_protocol.c 2000/10/08 23:22:35 1.153
+++ http_protocol.c 2000/10/09 19:03:24 1.154
@@ -866,7 +866,7 @@
#define ASCII_LF '\012'
ap_bucket *e;
char *buff;
- int length;
+ apr_ssize_t length;
char *pos;
int state = 0;
http_ctx_t *ctx = f->ctx;
@@ -963,7 +963,7 @@
const char *temp;
int retval;
int total = 0;
- int length;
+ apr_ssize_t length;
ap_bucket_brigade *b;
ap_bucket *e;
1.44 +1 -1 apache-2.0/src/modules/standard/mod_cgid.c
Index: mod_cgid.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgid.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mod_cgid.c 2000/10/06 17:52:46 1.43
+++ mod_cgid.c 2000/10/09 19:03:27 1.44
@@ -841,7 +841,7 @@
char **env;
struct sockaddr_un unix_addr;
apr_file_t *tempsock = NULL;
- int nbytes;
+ apr_ssize_t nbytes;
if (r->method_number == M_OPTIONS) {
/* 99 out of 100 cgid scripts, this is all they support */