Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix build errors

  • Loading branch information...
commit bed20fdd82f8722ed59ae5a7ab52065402747829 1 parent 2687033
@hollow authored
Showing with 10 additions and 5 deletions.
  1. +5 −0 .gitignore
  2. +1 −1  fcgi_protocol.c
  3. +4 −4 mod_fastcgi.c
View
5 .gitignore
@@ -0,0 +1,5 @@
+*.la
+*.lo
+*.o
+*.slo
+.libs/
View
2  fcgi_protocol.c
@@ -371,7 +371,7 @@ int fcgi_protocol_dequeue(apr_pool_t *p, fcgi_request *fr)
ap_log_rerror(FCGI_LOG_ERR_NOERRNO, fr->r,
"FastCGI: comm with server \"%s\" aborted: protocol error: "
"invalid FCGI_END_REQUEST size: "
- "%d != sizeof(FCGI_EndRequestBody)(%d)",
+ "%d != sizeof(FCGI_EndRequestBody)(%zu)",
fr->fs_path, fr->dataLen, sizeof(FCGI_EndRequestBody));
return HTTP_INTERNAL_SERVER_ERROR;
}
View
8 mod_fastcgi.c
@@ -211,6 +211,7 @@ const char *process_headers(request_rec *r, fcgi_request *fr)
char *p = (char *)fr->header->elts;
int len = fr->header->nelts;
int flag = 0;
+ char *key, *value;
while (len-- && flag < 2) {
switch(*p) {
@@ -222,7 +223,7 @@ const char *process_headers(request_rec *r, fcgi_request *fr)
case '\0':
case '\v':
case '\f':
- name = "Invalid Character";
+ key = "Invalid Character";
goto BadHeader;
default:
flag = 0;
@@ -243,7 +244,6 @@ const char *process_headers(request_rec *r, fcgi_request *fr)
hasContentType = hasStatus = hasLocation = FALSE;
char *next = (char *)fr->header->elts;
- char *key, *value;
while(1) {
key = next;
@@ -930,7 +930,7 @@ int create_fcgi_request(request_rec *r, fcgi_request **frP)
if (fs == NULL) {
ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
- "FastCGI: invalid server \"%s\": %s", fs_path, err);
+ "FastCGI: invalid server: \"%s\"", fs_path);
return HTTP_FORBIDDEN;
}
@@ -1002,7 +1002,7 @@ int fcgi_pass_handler(request_rec *r)
return DECLINED;
/* setup a new FastCGI request */
- if ((ret = create_fcgi_request(r, NULL, &fr))) {
+ if ((ret = create_fcgi_request(r, &fr))) {
return ret;
}
Please sign in to comment.
Something went wrong with that request. Please try again.