diff options
Diffstat (limited to 'apps/JAWS')
| -rw-r--r-- | apps/JAWS/ChangeLog | 17 | ||||
| -rw-r--r-- | apps/JAWS/clients/Caching/http_client.cpp | 10 | ||||
| -rw-r--r-- | apps/JAWS/clients/Caching/http_handler.cpp | 1 | ||||
| -rw-r--r-- | apps/JAWS/server/HTTP_Response.cpp | 4 | ||||
| -rw-r--r-- | apps/JAWS/server/HTTP_Server.cpp | 1 | ||||
| -rw-r--r-- | apps/JAWS/server/HTTP_Server.h | 4 | ||||
| -rw-r--r-- | apps/JAWS/server/IO.cpp | 5 |
7 files changed, 14 insertions, 28 deletions
diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog index 3b8e95edbdb..0b8c3274945 100644 --- a/apps/JAWS/ChangeLog +++ b/apps/JAWS/ChangeLog @@ -1,10 +1,3 @@ -Thu Aug 26 08:13:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> - - * clients/Caching/http_client.cpp: - * server/HTTP_Response.cpp: - Added include of ace/os_include/os_ctype.h to fix compile problems - in our daily builds. - Tue Feb 25 18:58:26 2003 Carlos O'Ryan <coryan@atdesk.com> * clients/WebSTONE/src/cgi-send: @@ -51,19 +44,19 @@ Mon Aug 13 14:04:44 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> 1) Allow a static libHTTPU.a to be built when "make static_libs_only=1" is used. - + 2) When I try to build both JAWS and JAWS2 with the same ACE_ROOT, the libJAWS.* that is built and installed first prevents the other JAWS from properly compiling. This resolves this problem by renaming the JAWS2 library to libJAWS2.*. - + 3) The JAWS2 subdirectory is now descended into by - apps/Makefile. - + apps/Makefile. + 4) The Makefile in JAWS2 now descends into HTTPU and JAWS to build those libraries. - + Tue Jun 12 20:35:26 2001 Krishnakumar B <kitty@cs.wustl.edu> * clients/Blobby/Blob_Handler.cpp: diff --git a/apps/JAWS/clients/Caching/http_client.cpp b/apps/JAWS/clients/Caching/http_client.cpp index afbc38a2513..6022cb289f2 100644 --- a/apps/JAWS/clients/Caching/http_client.cpp +++ b/apps/JAWS/clients/Caching/http_client.cpp @@ -4,7 +4,7 @@ // // = LIBRARY // apps/JAWS/clients/Caching -// +// // = FILENAME // http_client.cpp // @@ -14,11 +14,9 @@ // // = AUTHOR // James Hu -// +// // ============================================================================ -#include "ace/OS_NS_stdio.h" -#include "ace/os_include/os_ctype.h" #include "http_handler.h" ACE_RCSID(Caching, http_client, "$Id$") @@ -52,8 +50,8 @@ main (int, char *[]) if (*s == '!') { - do - s++; + do + s++; while (isspace (*s)); // Shell command. diff --git a/apps/JAWS/clients/Caching/http_handler.cpp b/apps/JAWS/clients/Caching/http_handler.cpp index 0d879af7173..36bd8343d34 100644 --- a/apps/JAWS/clients/Caching/http_handler.cpp +++ b/apps/JAWS/clients/Caching/http_handler.cpp @@ -13,7 +13,6 @@ // // ============================================================================ -#include "ace/OS_NS_string.h" #include "ace/Filecache.h" #include "http_handler.h" diff --git a/apps/JAWS/server/HTTP_Response.cpp b/apps/JAWS/server/HTTP_Response.cpp index e187ba10934..50c14604253 100644 --- a/apps/JAWS/server/HTTP_Response.cpp +++ b/apps/JAWS/server/HTTP_Response.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_string.h" -#include "ace/os_include/os_ctype.h" #include "ace/Process.h" #include "ace/Mem_Map.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" #include "HTTP_Response.h" #include "HTTP_Request.h" diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp index 99aa97e71ff..9aaa4b920d4 100644 --- a/apps/JAWS/server/HTTP_Server.cpp +++ b/apps/JAWS/server/HTTP_Server.cpp @@ -4,7 +4,6 @@ #define ACE_BUILD_SVC_DLL #endif /* ACE_BUILD_SVC_DLL */ -#include "ace/OS_NS_string.h" #include "ace/Get_Opt.h" #include "ace/Asynch_Acceptor.h" #include "ace/LOCK_SOCK_Acceptor.h" diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h index a81f34d244e..a9e630acedd 100644 --- a/apps/JAWS/server/HTTP_Server.h +++ b/apps/JAWS/server/HTTP_Server.h @@ -17,12 +17,12 @@ #ifndef HTTP_SERVER_H #define HTTP_SERVER_H +#include "ace/Service_Object.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Config.h" -#include "ace/Service_Object.h" #include "ace/Thread_Manager.h" #include "ace/Acceptor.h" #include "ace/LOCK_SOCK_Acceptor.h" diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp index 63267987b81..5594c713b54 100644 --- a/apps/JAWS/server/IO.cpp +++ b/apps/JAWS/server/IO.cpp @@ -1,13 +1,12 @@ // $Id$ -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_sys_uio.h" -#include "ace/OS_NS_sys_socket.h" #include "ace/Message_Block.h" #include "ace/SOCK_Stream.h" #include "ace/Filecache.h" #include "IO.h" #include "HTTP_Helpers.h" +#include "ace/OS_NS_sys_uio.h" +#include "ace/OS_NS_sys_socket.h" ACE_RCSID(server, IO, "$Id$") |