Skip to content

Commit 305737c

Browse files
wrowewrowe
committed
 All the supports now build on APR (+APRUTIL), no reliance on httpd. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87501 13f79535-47bb-0310-9956-ffa450edef68
1 parent 6d60b48 commit 305737c

10 files changed

Lines changed: 79 additions & 82 deletions

File tree

‎support/ab.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,16 @@
130130
#ifdef NOT_ASCII
131131
#include "apr_xlate.h"
132132
#endif
133-
#ifdef HAVE_STRING_H
133+
#if APR_HAVE_STRING_H
134134
#include <string.h>
135135
#endif
136-
#ifdef HAVE_STDIO_H
136+
#if APR_HAVE_STDIO_H
137137
#include <stdio.h>
138138
#endif
139-
#ifdef HAVE_STDLIB_H
139+
#if APR_HAVE_STDLIB_H
140140
#include <stdlib.h>
141141
#endif
142-
#ifdef HAVE_CTYPE_H
142+
#if APR_HAVE_CTYPE_H
143143
#include <ctype.h>
144144
#endif
145145

@@ -893,14 +893,14 @@ static void test(void)
893893
static void copyright(void)
894894
{
895895
if (!use_html) {
896-
printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.44 $> apache-2.0");
896+
printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.45 $> apache-2.0");
897897
printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
898898
printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
899899
printf("\n");
900900
}
901901
else {
902902
printf("<p>\n");
903-
printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.44 $");
903+
printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.45 $");
904904
printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
905905
printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
906906
printf("</p>\n<p>\n");

‎support/ab.dsp‎

Lines changed: 12 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎support/htdigest.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@
7474
#include <stdio.h>
7575
#endif
7676

77-
#ifdef HAVE_SYS_TYPES_H
77+
#if APR_HAVE_SYS_TYPES_H
7878
#include <sys/types.h>
7979
#endif
8080

81-
#ifdef HAVE_SYS_SIGNAL_H
81+
#if APR_HAVE_SYS_SIGNAL_H
8282
#include <sys/signal.h>
8383
#endif
8484

85-
#ifdef HAVE_SIGNAL_H
85+
#if APR_HAVE_SIGNAL_H
8686
#include <signal.h>
8787
#endif
8888

‎support/htdigest.dsp‎

Lines changed: 12 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎support/htpasswd.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,12 @@
9292

9393
#include "apr_md5.h"
9494
#include "ap_sha1.h"
95+
#if APR_HAVE_SIGNAL_H
9596
#include <signal.h>
97+
#endif
9698
#include <time.h>
9799

98-
#ifdef HAVE_CRYPT_H
100+
#if APR_HAVE_CRYPT_H
99101
#include <crypt.h>
100102
#endif
101103

‎support/htpasswd.dsp‎

Lines changed: 8 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎support/logresolve.c‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,22 @@
4040
*/
4141

4242
#include "apr_lib.h"
43+
#if APR_HAVE_STDIO_H
4344
#include <stdio.h>
44-
#ifdef HAVE_CTYPE_H
45+
#endif
46+
#if APR_HAVE_CTYPE_H
4547
#include <ctype.h>
4648
#endif
47-
#ifdef HAVE_NETDB_H
49+
#if APR_HAVE_NETDB_H
4850
#include <netdb.h>
4951
#endif
50-
#ifdef HAVE_NETINET_IN_H
52+
#if APR_HAVE_NETINET_IN_H
5153
#include <netinet/in.h>
5254
#endif
53-
#ifdef HAVE_SYS_SOCKET_H
55+
#if APR_HAVE_SYS_SOCKET_H
5456
#include <sys/socket.h>
5557
#endif
56-
#ifdef HAVE_ARPA_INET_H
58+
#if APR_HAVE_ARPA_INET_H
5759
#include <arpa/inet.h>
5860
#endif
5961

@@ -77,7 +79,7 @@ static void stats(FILE *output);
7779
/* number of buckets in cache hash apr_table_t */
7880
#define BUCKETS 256
7981

80-
#if defined(NEED_STRDUP)
82+
#if !APR_HAVE_STRDUP
8183
char *strdup (const char *str)
8284
{
8385
char *dup;

‎support/logresolve.dsp‎

Lines changed: 8 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎support/rotatelogs.c‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,22 @@
6161
*/
6262

6363

64-
#include "ap_config.h"
65-
#include <stdio.h>
66-
#ifdef HAVE_UNISTD_H
67-
#include <unistd.h>
68-
#endif
64+
#include "apr.h"
6965
#include <stdlib.h>
7066
#include <time.h>
7167
#include <errno.h>
68+
#if APR_HAVE_STDIO_H
69+
#include <stdio.h>
70+
#endif
71+
#if APR_HAVE_UNISTD_H
72+
#include <unistd.h>
73+
#endif
74+
#if APR_HAVE_IO_H
75+
#include <io.h>
76+
#endif
77+
#if APR_HAVE_FCNTL_H
7278
#include <fcntl.h>
79+
#endif
7380

7481
#define BUFSIZE 65536
7582
#define ERRMSGSZ 82

‎support/rotatelogs.dsp‎

Lines changed: 7 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)