1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
Index: fcgi-2.4.0/cgi-fcgi/cgi-fcgi.c
===================================================================
--- fcgi-2.4.0.orig/cgi-fcgi/cgi-fcgi.c
+++ fcgi-2.4.0/cgi-fcgi/cgi-fcgi.c
@@ -21,6 +21,7 @@ static const char rcsid[] = "$Id: cgi-fc
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
#include "fcgi_config.h"
@@ -145,7 +146,7 @@ static FCGI_BeginRequestBody MakeBeginRe
static int bytesToRead; /* number of bytes to read from Web Server */
-static int appServerSock = -1; /* Socket connected to FastCGI application,
+static size_t appServerSock = -1; /* Socket connected to FastCGI application,
* used by AppServerReadHandler and
* AppServerWriteHandler. */
static Buffer fromAS; /* Bytes read from the FCGI application server. */
@@ -640,7 +641,7 @@ static int ParseArgs(int argc, char *arg
}
if((av[ac] = (char *)malloc(strlen(tp1)+1)) == NULL) {
fprintf(stderr, "Cannot allocate %d bytes\n",
- strlen(tp1)+1);
+ (int)strlen(tp1)+1);
exit(-1);
}
strcpy(av[ac++], tp1);
Index: fcgi-2.4.0/examples/threaded.c
===================================================================
--- fcgi-2.4.0.orig/examples/threaded.c
+++ fcgi-2.4.0/examples/threaded.c
@@ -24,7 +24,7 @@ static int counts[THREAD_COUNT];
static void *doit(void *a)
{
- int rc, i, thread_id = (int)a;
+ size_t rc, i, thread_id = (size_t)a;
pid_t pid = getpid();
FCGX_Request request;
char *server_name;
@@ -53,7 +53,7 @@ static void *doit(void *a)
"<h1>FastCGI Hello! (multi-threaded C, fcgiapp library)</h1>"
"Thread %d, Process %ld<p>"
"Request counts for %d threads running on host <i>%s</i><p><code>",
- thread_id, pid, THREAD_COUNT, server_name ? server_name : "?");
+ (int)thread_id, pid, THREAD_COUNT, server_name ? server_name : "?");
sleep(2);
@@ -71,7 +71,7 @@ static void *doit(void *a)
int main(void)
{
- int i;
+ size_t i;
pthread_t id[THREAD_COUNT];
FCGX_Init();
Index: fcgi-2.4.0/include/fcgios.h
===================================================================
--- fcgi-2.4.0.orig/include/fcgios.h
+++ fcgi-2.4.0/include/fcgios.h
@@ -93,7 +93,7 @@ extern "C" {
# if defined(__STDC__) || defined(__cplusplus)
typedef void *ClientData;
# else
- typedef int *ClientData;
+ typedef size_t *ClientData;
# endif /* __STDC__ */
#define _CLIENTDATA
#endif
Index: fcgi-2.4.0/libfcgi/os_unix.c
===================================================================
--- fcgi-2.4.0.orig/libfcgi/os_unix.c
+++ fcgi-2.4.0/libfcgi/os_unix.c
@@ -1155,7 +1155,7 @@ int OS_Accept(int listen_sock, int fail_
for (;;) {
do {
-#ifdef HAVE_SOCKLEN
+#ifdef HAVE_SYS_SOCKET_H
socklen_t len = sizeof(sa);
#else
int len = sizeof(sa);
@@ -1255,7 +1255,7 @@ int OS_IsFcgi(int sock)
struct sockaddr_in in;
struct sockaddr_un un;
} sa;
-#ifdef HAVE_SOCKLEN
+#ifdef HAVE_SYS_SOCKET_H
socklen_t len = sizeof(sa);
#else
int len = sizeof(sa);
|
