--- a/packages/net/httpd/current/ChangeLog
+++ b/packages/net/httpd/current/ChangeLog
@@ -1,3 +1,13 @@
+2003-09-23  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+        * src/httpd.c (cyg_httpd_server): Removed unused variable.
+        * doc/httpd.sgml: Updated documentation for previous change.
+
+2003-09-22  Eric Doenges  <Eric.Doenges@DynaPel.com>
+	
+        * include/httpd.h: changed prototype of cyg_httpd_send_html and
+        cyg_httpd_send_data to match implementation.
+
 2003-06-09  Nick Garnett  <nickg@balti.calivar.com>
 
 	* src/httpd.c: Fixed a problem with closing the client socket --

--- a/packages/net/httpd/current/doc/httpd.sgml
+++ b/packages/net/httpd/current/doc/httpd.sgml
@@ -434,7 +434,7 @@ value part of the string whose name part
 <title>Predefined Handlers</title>
 <programlisting width=72>
 
-int cyg_httpd_send_html( FILE *client, char *filename, char *request, void *arg );
+cyg_bool cyg_httpd_send_html( FILE *client, char *filename, char *request, void *arg );
 
 typedef struct
 {
@@ -444,7 +444,7 @@ typedef struct
 } cyg_httpd_data;
 #define CYG_HTTPD_DATA( __name, __type, __length, __data )
 
-int cyg_httpd_send_data( FILE *client, char *filename, char *request, void *arg );
+cyg_bool cyg_httpd_send_data( FILE *client, char *filename, char *request, void *arg );
 
 </programlisting>
 <para>

--- a/packages/net/httpd/current/include/httpd.h
+++ b/packages/net/httpd/current/include/httpd.h
@@ -92,8 +92,8 @@ cyg_httpd_table_entry __name CYG_HAL_TAB
 /*
  */
 
-__externC int cyg_httpd_send_html( FILE *client, char *filename,
-                                   char *request, void *arg );
+__externC cyg_bool cyg_httpd_send_html( FILE *client, char *filename,
+                                        char *request, void *arg );
 
 /* ----------------------------------------------------------------- */
 /*
@@ -106,8 +106,8 @@ typedef struct
     cyg_uint8   *data;
 } cyg_httpd_data;
 
-__externC int cyg_httpd_send_data( FILE *client, char *filename,
-                                   char *request, void *arg );
+__externC cyg_bool cyg_httpd_send_data( FILE *client, char *filename,
+                                        char *request, void *arg );
 
 #define CYG_HTTPD_DATA( __name, __type, __length, __data ) \
 cyg_httpd_data __name = { __type, __length, __data }

--- a/packages/net/httpd/current/src/httpd.c
+++ b/packages/net/httpd/current/src/httpd.c
@@ -265,7 +265,6 @@ static void cyg_httpd_server( cyg_addrwo
 {
     do
     {
-        int err;
         int client_socket;
         struct sockaddr client_address;
         int calen = sizeof(client_address);