projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapted comments to new built-in images
[privoxy.git]
/
cgisimple.c
diff --git
a/cgisimple.c
b/cgisimple.c
index
527db0e
..
d3e3891
100644
(file)
--- a/
cgisimple.c
+++ b/
cgisimple.c
@@
-1,4
+1,4
@@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.1
3 2002/02/21 00:10:37
jongfoster Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.1
5 2002/03/06 22:54:35
jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@
-36,6
+36,12
@@
const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.13 2002/02/21 00:10:37 jongfo
*
* Revisions :
* $Log: cgisimple.c,v $
*
* Revisions :
* $Log: cgisimple.c,v $
+ * Revision 1.15 2002/03/06 22:54:35 jongfoster
+ * Automated function-comment nitpicking.
+ *
+ * Revision 1.14 2002/03/02 04:14:50 david__schmidt
+ * Clean up a little CRLF unpleasantness that suddenly appeared
+ *
* Revision 1.13 2002/02/21 00:10:37 jongfoster
* Adding send-banner?type=auto option
*
* Revision 1.13 2002/02/21 00:10:37 jongfoster
* Adding send-banner?type=auto option
*
@@
-135,9
+141,9
@@
static jb_err show_defines(struct map *exports);
* Lists menu of available unhidden CGIs.
*
* Parameters :
* Lists menu of available unhidden CGIs.
*
* Parameters :
- *
1
: csp = Current client state (buffers, headers, etc...)
- *
2
: rsp = http_response data structure for output
- *
3
: parameters = map of cgi parameters
+ *
1
: csp = Current client state (buffers, headers, etc...)
+ *
2
: rsp = http_response data structure for output
+ *
3
: parameters = map of cgi parameters
*
* CGI Parameters : none
*
*
* CGI Parameters : none
*
@@
-202,9
+208,9
@@
jb_err cgi_default(struct client_state *csp,
* given.
*
* Parameters :
* given.
*
* Parameters :
- *
1
: csp = Current client state (buffers, headers, etc...)
- *
2
: rsp = http_response data structure for output
- *
3
: parameters = map of cgi parameters
+ *
1
: csp = Current client state (buffers, headers, etc...)
+ *
2
: rsp = http_response data structure for output
+ *
3
: parameters = map of cgi parameters
*
* CGI Parameters : none
*
*
* CGI Parameters : none
*
@@
-246,9
+252,9
@@
jb_err cgi_error_404(struct client_state *csp,
* made of it.
*
* Parameters :
* made of it.
*
* Parameters :
- *
1
: csp = Current client state (buffers, headers, etc...)
- *
2
: rsp = http_response data structure for output
- *
3
: parameters = map of cgi parameters
+ *
1
: csp = Current client state (buffers, headers, etc...)
+ *
2
: rsp = http_response data structure for output
+ *
3
: parameters = map of cgi parameters
*
* CGI Parameters : none
*
*
* CGI Parameters : none
*
@@
-309,9
+315,9
@@
jb_err cgi_show_request(struct client_state *csp,
* Description : CGI function that returns a banner.
*
* Parameters :
* Description : CGI function that returns a banner.
*
* Parameters :
- *
1
: csp = Current client state (buffers, headers, etc...)
- *
2
: rsp = http_response data structure for output
- *
3
: parameters = map of cgi parameters
+ *
1
: csp = Current client state (buffers, headers, etc...)
+ *
2
: rsp = http_response data structure for output
+ *
3
: parameters = map of cgi parameters
*
* CGI Parameters :
* type : Selects the type of banner between "trans", "logo",
*
* CGI Parameters :
* type : Selects the type of banner between "trans", "logo",
@@
-342,21
+348,31
@@
jb_err cgi_send_banner(struct client_state *csp,
/* and handle accordingly: */
if ((p != NULL) && (0 == strcmpic(p, "blank")))
{
/* and handle accordingly: */
if ((p != NULL) && (0 == strcmpic(p, "blank")))
{
- imagetype = 't';
+ imagetype = 'b';
+ }
+ else if ((p != NULL) && (0 == strcmpic(p, "pattern")))
+ {
+ imagetype = 'p';
}
}
#endif /* def FEATURE_IMAGE_BLOCKING */
}
}
}
#endif /* def FEATURE_IMAGE_BLOCKING */
}
- if ((imagetype
!= 't') && (imagetype != 'b')) /* transparant/blank
*/
+ if ((imagetype
== 'b') || (imagetype == 't')) /* blank / transparent
*/
{
{
- rsp->body = bindup(image_junkbuster_gif_data, image_junkbuster_gif_length);
- rsp->content_length = image_junkbuster_gif_length;
+ rsp->body = bindup(image_blank_data, image_blank_length);
+ rsp->content_length = image_blank_length;
+
}
}
- else
+ else if (imagetype == 'p') /* pattern */
+ {
+ rsp->body = bindup(image_pattern_data, image_pattern_length);
+ rsp->content_length = image_pattern_length;
+ }
+ else /* logo */
{
{
- rsp->body = bindup(image_
blank_gif_data, image_blank_gif
_length);
- rsp->content_length = image_
blank_gif
_length;
+ rsp->body = bindup(image_
logo_data, image_logo
_length);
+ rsp->content_length = image_
logo
_length;
}
if (rsp->body == NULL)
}
if (rsp->body == NULL)
@@
-364,7
+380,7
@@
jb_err cgi_send_banner(struct client_state *csp,
return JB_ERR_MEMORY;
}
return JB_ERR_MEMORY;
}
- if (enlist(rsp->headers, "Content-Type: image/
gif
"))
+ if (enlist(rsp->headers, "Content-Type: image/
png
"))
{
return JB_ERR_MEMORY;
}
{
return JB_ERR_MEMORY;
}
@@
-378,14
+394,14
@@
jb_err cgi_send_banner(struct client_state *csp,
/*********************************************************************
*
/*********************************************************************
*
- * Function : cgi_transparent_
gif
+ * Function : cgi_transparent_
png
*
*
- * Description : CGI function that sends a 1x1 transparent
GIF
.
+ * Description : CGI function that sends a 1x1 transparent
PNG
.
*
* Parameters :
*
* Parameters :
- *
1
: csp = Current client state (buffers, headers, etc...)
- *
2
: rsp = http_response data structure for output
- *
3
: parameters = map of cgi parameters
+ *
1
: csp = Current client state (buffers, headers, etc...)
+ *
2
: rsp = http_response data structure for output
+ *
3
: parameters = map of cgi parameters
*
* CGI Parameters : None
*
*
* CGI Parameters : None
*
@@
-393,19
+409,19
@@
jb_err cgi_send_banner(struct client_state *csp,
* JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
* JB_ERR_MEMORY on out-of-memory error.
*
*********************************************************************/
-jb_err cgi_transparent_
gif
(struct client_state *csp,
+jb_err cgi_transparent_
png
(struct client_state *csp,
struct http_response *rsp,
const struct map *parameters)
{
struct http_response *rsp,
const struct map *parameters)
{
- rsp->body = bindup(image_blank_
gif_data, image_blank_gif
_length);
- rsp->content_length = image_blank_
gif_
length;
+ rsp->body = bindup(image_blank_
data, image_blank
_length);
+ rsp->content_length = image_blank_length;
if (rsp->body == NULL)
{
return JB_ERR_MEMORY;
}
if (rsp->body == NULL)
{
return JB_ERR_MEMORY;
}
- if (enlist(rsp->headers, "Content-Type: image/
gif
"))
+ if (enlist(rsp->headers, "Content-Type: image/
png
"))
{
return JB_ERR_MEMORY;
}
{
return JB_ERR_MEMORY;
}
@@
-425,9
+441,9
@@
jb_err cgi_transparent_gif(struct client_state *csp,
* file versions of IJB.
*
* Parameters :
* file versions of IJB.
*
* Parameters :
- *
1
: csp = Current client state (buffers, headers, etc...)
- *
2
: rsp = http_response data structure for output
- *
3
: parameters = map of cgi parameters
+ *
1
: csp = Current client state (buffers, headers, etc...)
+ *
2
: rsp = http_response data structure for output
+ *
3
: parameters = map of cgi parameters
*
* CGI Parameters : none
*
*
* CGI Parameters : none
*
@@
-468,9
+484,9
@@
jb_err cgi_show_version(struct client_state *csp,
* current status of IJB.
*
* Parameters :
* current status of IJB.
*
* Parameters :
- *
1
: csp = Current client state (buffers, headers, etc...)
- *
2
: rsp = http_response data structure for output
- *
3
: parameters = map of cgi parameters
+ *
1
: csp = Current client state (buffers, headers, etc...)
+ *
2
: rsp = http_response data structure for output
+ *
3
: parameters = map of cgi parameters
*
* CGI Parameters :
* file : Which file to show. Only first letter is checked,
*
* CGI Parameters :
* file : Which file to show. Only first letter is checked,
@@
-689,9
+705,9
@@
jb_err cgi_show_status(struct client_state *csp,
* matches starting from the defaults have lead to that.
*
* Parameters :
* matches starting from the defaults have lead to that.
*
* Parameters :
- *
1
: csp = Current client state (buffers, headers, etc...)
- *
2
: rsp = http_response data structure for output
- *
3
: parameters = map of cgi parameters
+ *
1
: csp = Current client state (buffers, headers, etc...)
+ *
2
: rsp = http_response data structure for output
+ *
3
: parameters = map of cgi parameters
*
* CGI Parameters :
* url : The url whose actions are to be determined.
*
* CGI Parameters :
* url : The url whose actions are to be determined.
@@
-948,9
+964,9
@@
jb_err cgi_show_url_info(struct client_state *csp,
* Description : CGI function to return "/robots.txt".
*
* Parameters :
* Description : CGI function to return "/robots.txt".
*
* Parameters :
- *
1
: csp = Current client state (buffers, headers, etc...)
- *
2
: rsp = http_response data structure for output
- *
3
: parameters = map of cgi parameters
+ *
1
: csp = Current client state (buffers, headers, etc...)
+ *
2
: rsp = http_response data structure for output
+ *
3
: parameters = map of cgi parameters
*
* CGI Parameters : None
*
*
* CGI Parameters : None
*
@@
-997,7
+1013,7
@@
jb_err cgi_robots_txt(struct client_state *csp,
* used when building
*
* Parameters :
* used when building
*
* Parameters :
- *
1
: exports = map to extend
+ *
1
: exports = map to extend
*
* Returns : JB_ERR_OK on success
* JB_ERR_MEMORY on out-of-memory error.
*
* Returns : JB_ERR_OK on success
* JB_ERR_MEMORY on out-of-memory error.