X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgi.c;h=71d8a52e4666d59ab6ef0c6da5a5cb10f2cc0d57;hp=96af186c014d28f5010b080587f94d385cdade7e;hb=34a82d2925cc2d2f34e8275b7259d0530d79abe0;hpb=22fdfb820f45adb31eb69b0b08e628c3512902d9
diff --git a/cgi.c b/cgi.c
index 96af186c..71d8a52e 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.131 2011/06/23 14:01:01 fabiankeil Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.133 2011/06/25 12:40:27 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
@@ -551,7 +551,9 @@ static struct http_response *dispatch_known_cgi(struct client_state * csp,
if (err && (err != JB_ERR_MEMORY))
{
/* Unexpected error! Shouldn't get here */
- log_error(LOG_LEVEL_ERROR, "Unexpected CGI error %d in top-level handler. Please file a bug report!", err);
+ log_error(LOG_LEVEL_ERROR,
+ "Unexpected CGI error %d in top-level handler. "
+ "Please file a bug report!", err);
err = cgi_error_unknown(csp, rsp, err);
}
if (!err)
@@ -1041,17 +1043,17 @@ void cgi_init_error_messages(void)
"Content-Type: text/html\r\n"
"\r\n";
cgi_error_memory_response->body =
- "\r\n"
- "\r\n"
- " 500 Internal Privoxy Error \r\n"
+ "\n"
+ "\n"
+ " 500 Internal Privoxy Error \n"
" 500 Internal Privoxy Error \r\n"
- "Privoxy ran out of memory while processing your request.
\r\n"
- "Please contact your proxy administrator, or try again later
\r\n"
- "\r\n"
- "\r\n";
+ "\n"
+ "\n"
+ "500 Internal Privoxy Error \n"
+ "Privoxy ran out of memory while processing your request.
\n"
+ "Please contact your proxy administrator, or try again later
\n"
+ "\n"
+ "\n";
cgi_error_memory_response->head_length =
strlen(cgi_error_memory_response->head);
@@ -1109,18 +1111,18 @@ jb_err cgi_error_no_template(const struct client_state *csp,
static const char status[] =
"500 Internal Privoxy Error";
static const char body_prefix[] =
- "\r\n"
- "\r\n"
- " 500 Internal Privoxy Error \r\n"
+ "\n"
+ "\n"
+ " 500 Internal Privoxy Error \n"
" 500 Internal Privoxy Error \r\n"
- "Privoxy encountered an error while processing your request:
\r\n"
+ "\n"
+ "\n"
+ "500 Internal Privoxy Error \n"
+ "Privoxy encountered an error while processing your request:
\n"
"Could not load template file ";
static const char body_suffix[] =
- " or one of its included components.
\r\n"
- "Please contact your proxy administrator.
\r\n"
+ " or one of its included components.\n"
+ "Please contact your proxy administrator.
\n"
"If you are the proxy administrator, please put the required file(s)"
"in the (confdir) /templates(confdir) /etc/privoxy/"
#endif /* ndef _WIN32 */
- ").
\r\n"
- "\r\n"
- "\r\n";
+ ").\n"
+ "\n"
+ "\n";
const size_t body_size = strlen(body_prefix) + strlen(template_name) + strlen(body_suffix) + 1;
assert(csp);
@@ -1196,22 +1198,22 @@ jb_err cgi_error_unknown(const struct client_state *csp,
static const char status[] =
"500 Internal Privoxy Error";
static const char body_prefix[] =
- "\r\n"
- "\r\n"
- " 500 Internal Privoxy Error \r\n"
+ "\n"
+ "\n"
+ " 500 Internal Privoxy Error \n"
" 500 Internal Privoxy Error \r\n"
- "Privoxy encountered an error while processing your request:
\r\n"
+ "\n"
+ "\n"
+ "500 Internal Privoxy Error \n"
+ "Privoxy encountered an error while processing your request:
\n"
"Unexpected internal error: ";
static const char body_suffix[] =
- "
\r\n"
+ "\n"
"Please "
""
- "file a bug report .
\r\n"
- "\r\n"
- "\r\n";
+ "file a bug report.\n"
+ "\n"
+ "\n";
/* Includes room for larger error numbers in the future. */
const size_t body_size = sizeof(body_prefix) + sizeof(body_suffix) + 5;
assert(csp);