wrowe 2002/05/31 00:59:27
Modified: flood flood.c flood_config.c flood_easy_reports.c
flood_farm.c flood_farmer.c flood_net_ssl.c
flood_profile.c flood_report_relative_times.c
flood_round_robin.c flood_socket_generic.c
flood_socket_keepalive.c flood_test.c
Log:
Fix massive header bogosity
Revision Changes Path
1.8 +7 -4 httpd-test/flood/flood.c
Index: flood.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- flood.c 17 Nov 2001 01:22:10 -0000 1.7
+++ flood.c 31 May 2002 07:59:26 -0000 1.8
@@ -54,14 +54,17 @@
* Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
*/
-#include <stdlib.h> /* For atexit */
-#include <stdlib.h> /* For rand()/seed() */
-#include <unistd.h> /* For pause */
-#include <apr.h>
#include <apr_general.h> /* For apr_initialize */
#include <apr_strings.h>
#include <apr_file_io.h>
#include <apr_pools.h>
+
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h> /* rand/strtol */
+#endif
+#if APR_HAVE_UNISTD_H
+#include <unistd.h> /* For pause */
+#endif
#include "config.h"
#include "flood_profile.h"
1.4 +10 -3 httpd-test/flood/flood_config.c
Index: flood_config.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- flood_config.c 24 Jul 2001 06:42:29 -0000 1.3
+++ flood_config.c 31 May 2002 07:59:26 -0000 1.4
@@ -54,12 +54,19 @@
* Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
*/
-#include <strings.h> /* strncasecmp */
-#include <string.h> /* strncmp */
#include <apr_file_io.h>
#include <apr_xml.h>
#include <apr_strings.h>
-#include <stdlib.h>
+
+#if APR_HAVE_STRINGS_H
+#include <strings.h> /* strncasecmp */
+#endif
+#if APR_HAVE_STRING_H
+#include <string.h> /* strncasecmp */
+#endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h> /* strtol */
+#endif
#include "config.h"
#include "flood_config.h"
1.10 +5 -2 httpd-test/flood/flood_easy_reports.c
Index: flood_easy_reports.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_easy_reports.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- flood_easy_reports.c 3 Oct 2001 01:33:00 -0000 1.9
+++ flood_easy_reports.c 31 May 2002 07:59:26 -0000 1.10
@@ -54,11 +54,14 @@
* Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
*/
-#include "flood_easy_reports.h"
-#include <apr.h>
#include <apr_portable.h>
#include <apr_strings.h>
+
+#if APR_HAVE_UNISTD_H
#include <unistd.h>
+#endif
+
+#include "flood_easy_reports.h"
extern apr_file_t *local_stdout;
extern apr_file_t *local_stderr;
1.17 +11 -2 httpd-test/flood/flood_farm.c
Index: flood_farm.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_farm.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- flood_farm.c 17 Jan 2002 01:01:41 -0000 1.16
+++ flood_farm.c 31 May 2002 07:59:26 -0000 1.17
@@ -54,11 +54,20 @@
* Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
*/
-#include <stdlib.h> /* exit */
-#include <strings.h> /* strncasecmp */
#include <apr_errno.h>
#include <apr_thread_proc.h>
#include <apr_strings.h>
+
+#if APR_HAVE_STRINGS_H
+#include <strings.h> /* strncasecmp */
+#endif
+#if APR_HAVE_STRING_H
+#include <string.h> /* strncasecmp */
+#endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h> /* strtol */
+#endif
+
#include "config.h"
#include "flood_farmer.h"
1.10 +13 -2 httpd-test/flood/flood_farmer.c
Index: flood_farmer.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_farmer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- flood_farmer.c 23 Aug 2001 00:21:24 -0000 1.9
+++ flood_farmer.c 31 May 2002 07:59:27 -0000 1.10
@@ -54,11 +54,22 @@
* Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
*/
-#include <strings.h> /* strncasecmp */
-#include <stdlib.h> /* strtol */
#include <apr_pools.h>
#include <apr_errno.h>
#include <apr_strings.h>
+
+#if APR_HAVE_STRINGS_H
+#include <strings.h> /* strncasecmp */
+#endif
+#if APR_HAVE_STRING_H
+#include <string.h> /* strncasecmp */
+#endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h> /* strtol */
+#endif
+#if APR_HAVE_LIMITS_H
+#include <limits.h> /* strncasecmp */
+#endif
#include "config.h"
#include "flood_profile.h"
1.19 +7 -4 httpd-test/flood/flood_net_ssl.c
Index: flood_net_ssl.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_net_ssl.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- flood_net_ssl.c 9 Apr 2002 08:01:23 -0000 1.18
+++ flood_net_ssl.c 31 May 2002 07:59:27 -0000 1.19
@@ -54,6 +54,13 @@
* Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
*/
+#include <apr_portable.h>
+#include <apr_strings.h>
+
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#include "config.h"
#include "flood_profile.h"
#include "flood_net.h"
@@ -65,10 +72,6 @@
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/rand.h>
-
-#include <apr_portable.h>
-#include <apr_strings.h>
-#include <unistd.h>
struct ssl_socket_t {
SSL_CTX *ssl_context;
1.20 +7 -2 httpd-test/flood/flood_profile.c
Index: flood_profile.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_profile.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- flood_profile.c 3 Dec 2001 21:59:31 -0000 1.19
+++ flood_profile.c 31 May 2002 07:59:27 -0000 1.20
@@ -54,11 +54,16 @@
* Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
*/
-#include <stdlib.h>
#include <apr_file_io.h>
#include <apr_strings.h>
#include <apr_errno.h>
-#include <string.h>
+
+#if APR_HAVE_STRING_H
+#include <string.h> /* strncasecmp */
+#endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h> /* strtol */
+#endif
#include "config.h"
#include "flood_profile.h"
1.5 +6 -3 httpd-test/flood/flood_report_relative_times.c
Index: flood_report_relative_times.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_report_relative_times.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flood_report_relative_times.c 24 Aug 2001 04:26:39 -0000 1.4
+++ flood_report_relative_times.c 31 May 2002 07:59:27 -0000 1.5
@@ -54,11 +54,14 @@
* Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
*/
-#include "flood_report_relative_times.h"
-#include <unistd.h>
-#include <apr.h>
#include <apr_portable.h>
#include <apr_strings.h>
+
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "flood_report_relative_times.h"
extern apr_file_t *local_stdout;
extern apr_file_t *local_stderr;
1.24 +22 -9 httpd-test/flood/flood_round_robin.c
Index: flood_round_robin.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_round_robin.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- flood_round_robin.c 25 Mar 2002 23:41:16 -0000 1.23
+++ flood_round_robin.c 31 May 2002 07:59:27 -0000 1.24
@@ -54,14 +54,6 @@
* Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
*/
-#include <flood_profile.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <regex.h>
-#include <assert.h>
-
#include <apr_file_io.h>
#include <apr_network_io.h>
#include <apr_strings.h>
@@ -69,9 +61,31 @@
#include <apr_lib.h>
#include <apr_hash.h>
+#if APR_HAVE_STRINGS_H
+#include <strings.h> /* strncasecmp */
+#endif
+#if APR_HAVE_STRING_H
+#include <string.h> /* strncasecmp */
+#endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h> /* strtol */
+#endif
+#if APR_HAVE_UNISTD_H
+#include <unistd.h> /* For pause */
+#endif
+#if APR_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if APR_HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#include <assert.h>
+#include "regex.h"
+
#include "config.h"
#include "flood_net.h"
#include "flood_round_robin.h"
+#include "flood_profile.h"
/* On FreeBSD, the return of regexec() is 0 or REG_NOMATCH, and REG_OK is
undefined */
#ifndef REG_OK
@@ -570,7 +584,6 @@
for (e = urllist_elem->first_child; e; e = e->next) {
if (strncasecmp(e->name, XML_URLLIST_SEQUENCE, FLOOD_STRLEN_MAX) ==
0) {
- apr_xml_elem *child_url_elem;
int children_urls, list_count;
list_count = 0;
if (e->attr) {
1.7 +7 -1 httpd-test/flood/flood_socket_generic.c
Index: flood_socket_generic.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_socket_generic.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- flood_socket_generic.c 4 Dec 2001 09:10:34 -0000 1.6
+++ flood_socket_generic.c 31 May 2002 07:59:27 -0000 1.7
@@ -52,8 +52,14 @@
* <http://www.apache.org/>.
*/
+#include <apr.h>
+
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h> /* rand/strtol */
+#endif
+#if APR_HAVE_STRING_H
#include <string.h>
-#include <stdlib.h>
+#endif
#include "config.h"
#include "flood_net.h"
1.14 +7 -1 httpd-test/flood/flood_socket_keepalive.c
Index: flood_socket_keepalive.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_socket_keepalive.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- flood_socket_keepalive.c 27 Mar 2002 21:38:03 -0000 1.13
+++ flood_socket_keepalive.c 31 May 2002 07:59:27 -0000 1.14
@@ -52,8 +52,14 @@
* <http://www.apache.org/>.
*/
+#include <apr.h>
+
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h> /* rand/strtol */
+#endif
+#if APR_HAVE_STRING_H
#include <string.h>
-#include <stdlib.h>
+#endif
#include <assert.h>
#include "config.h"
1.3 +5 -3 httpd-test/flood/flood_test.c
Index: flood_test.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flood_test.c 19 Jul 2001 22:54:30 -0000 1.2
+++ flood_test.c 31 May 2002 07:59:27 -0000 1.3
@@ -54,13 +54,15 @@
* Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
*/
-#include <stdlib.h> /* For atexit */
-#include <apr.h>
#include <apr_general.h> /* For apr_initialize */
#include <apr_strings.h>
#include <apr_file_io.h>
-#include <flood_profile.h>
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h> /* atexit */
+#endif
+
+#include "flood_profile.h"
/* FIXME: Base this on RCS ID? */
#define FLOOD_VERSION ".001"
