cvs commit: apache-2.0/src/lib/apr/misc/beos misc.h start.c
dreid 99/10/08 04:29:55
Modified:src/lib/apr/misc/beos misc.h start.c
Log:
Continuing to bring the beos APR into line.
Revision ChangesPath
1.3 +7 -0 apache-2.0/src/lib/apr/misc/beos/misc.h
Index: misc.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/misc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- misc.h1999/08/27 16:25:41 1.2
+++ misc.h1999/10/08 11:29:54 1.3
@@ -60,6 +60,13 @@
#include apr_file_io.h
#include apr_errno.h
+typedef struct datastruct {
+void *data;
+char *key;
+struct datastruct *next;
+struct datastruct *prev;
+} datastruct;
+
struct context_t {
struct ap_pool_t *pool;
void *prog_data;
1.6 +41 -11apache-2.0/src/lib/apr/misc/beos/start.c
Index: start.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/start.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- start.c 1999/10/04 16:37:00 1.5
+++ start.c 1999/10/08 11:29:54 1.6
@@ -63,7 +63,7 @@
#include errno.h
#include string.h
-ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont,
void *data)
+ap_status_t ap_create_context(struct context_t **newcont, struct context_t
*cont)
{
ap_context_t *new;
ap_pool_t *pool;
@@ -87,12 +87,7 @@
}
new-pool = pool;
-if (data == NULL cont) {
-new-prog_data = cont-prog_data;
-}
-else {
-new-prog_data = data;
-}
+new-prog_data = NULL;
*newcont = new;
return APR_SUCCESS;
@@ -104,19 +99,54 @@
return APR_SUCCESS;
}
-ap_status_t ap_set_userdata(struct context_t *cont, void *data)
+ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key,
+ap_status_t (*cleanup) (void *))
{
+datastruct *dptr = NULL, *dptr2 = NULL;
if (cont) {
-cont-prog_data = data;
+dptr = cont-prog_data;
+while (dptr) {
+if (!strcmp(dptr-key, key))
+break;
+dptr2 = dptr;
+dptr = dptr-next;
+}
+if (dptr == NULL) {
+dptr = ap_palloc(cont, sizeof(datastruct));
+dptr-next = dptr-prev = NULL;
+dptr-key = strdup(key);
+if (dptr2) {
+dptr2-next = dptr;
+dptr-prev = dptr2;
+}
+else {
+cont-prog_data = dptr;
+}
+}
+dptr-data = data;
+ap_register_cleanup(cont, dptr-data, cleanup, cleanup);
return APR_SUCCESS;
}
return APR_ENOCONT;
}
-ap_status_t ap_get_userdata(void **data, struct context_t *cont)
+ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key)
{
+datastruct *dptr = NULL;
if (cont) {
-(*data) = cont-prog_data;
+dptr = cont-prog_data;
+while (dptr) {
+if (!strcmp(dptr-key, key)) {
+break;
+}
+dptr = dptr-next;
+}
+if (dptr) {
+(*data) = dptr-data;
+}
+else {
+(*data) = NULL;
+}
return APR_SUCCESS;
}
return APR_ENOCONT;
cvs commit: apache-2.0/src/lib/apr/locks/beos locks.c
dreid 99/10/08 04:33:28
Modified:src/lib/apr/locks/beos locks.c
Log:
And with this small change beos is up to date again!
Revision ChangesPath
1.3 +3 -1 apache-2.0/src/lib/apr/locks/beos/locks.c
Index: locks.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locks.c 1999/10/04 16:36:57 1.2
+++ locks.c 1999/10/08 11:33:28 1.3
@@ -59,7 +59,9 @@
#include strings.h
#include stdio.h
-ap_status_t ap_create_lock(struct lock_t **lock, ap_context_t *cont,
ap_locktype_e type, char *fname)
+ap_status_t ap_create_lock(ap_context_t *cont, ap_locktype_e type,
+ ap_lockscope_e scope, char *fname,
+ struct lock_t **lock)
{
struct lock_t *new;
ap_status_t stat;
cvs commit: apache-1.3/src/main alloc.c
rse 99/10/08 07:23:41
Modified:src/main alloc.c
Log:
fix typo
Revision ChangesPath
1.116 +1 -1 apache-1.3/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- alloc.c 1999/07/29 17:53:57 1.115
+++ alloc.c 1999/10/08 14:23:40 1.116
@@ -2145,7 +2145,7 @@
if (pipe_err) {
hStdErr = dup(fileno(stderr));
if(dup2(err_fds[1], fileno(stderr)))
- ap_log_error(APLOG_MARK, APLOG_ERR, NULL, dup2(stdin) failed);
+ ap_log_error(APLOG_MARK, APLOG_ERR, NULL, dup2(stderr)
failed);
close(err_fds[1]);
}
cvs commit: apache-2.0/src/lib/apr/lib apr_pools.c
rse 99/10/08 07:26:13
Modified:src/lib/apr/lib apr_pools.c
Log:
fix typo
Revision ChangesPath
1.13 +1 -1 apache-2.0/src/lib/apr/lib/apr_pools.c
Index: apr_pools.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apr_pools.c 1999/10/01 16:18:32 1.12
+++ apr_pools.c 1999/10/08 14:26:12 1.13
@@ -1286,7 +1286,7 @@
hStdErr = dup(fileno(stderr));
if (dup2(err_fds[1], fileno(stderr))) {
ap_log_error(APLOG_MARK, APLOG_ERR, NULL,
- dup2(stdin) failed);
+ dup2(stderr) failed);
}
close(err_fds[1]);
}
cvs commit: apache-2.0/src/os/win32 iol_socket.c
stoddard99/10/08 07:35:34 Modified:src/os/win32 iol_socket.c Log: close() doesn't work on Win32 sockets Revision ChangesPath 1.4 +1 -1 apache-2.0/src/os/win32/iol_socket.c Index: iol_socket.c === RCS file: /home/cvs/apache-2.0/src/os/win32/iol_socket.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- iol_socket.c 1999/08/19 15:13:50 1.3 +++ iol_socket.c 1999/10/08 14:35:34 1.4 @@ -114,7 +114,7 @@ iol_socket *iol = (iol_socket *)viol; int rv; -rv = close(iol-fd); +rv = closesocket(iol-fd); free(iol);
cvs commit: apache-2.0/src/lib/apr Makefile.in
dreid 99/10/08 09:10:39 Modified:src/lib/apr Makefile.in Log: This allows the build process for APR to make use of the extra flexability in the configure process. The MODULES and SUBDIRS are now generated by configure. Revision ChangesPath 1.10 +2 -3 apache-2.0/src/lib/apr/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.in 1999/09/27 06:39:37 1.9 +++ Makefile.in 1999/10/08 16:10:38 1.10 @@ -24,9 +24,8 @@ # # Macros for target determination # -MODULES=lib file_io network_io threadproc locks misc time signal -SUBDIRS=lib file_io/@OSDIR@ network_io/@OSDIR@ threadproc/@OSDIR@ \ -locks/@OSDIR@ misc/@OSDIR@ time/@OSDIR@ signal/@OSDIR@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ #shmem/@OSDIR@ #
cvs commit: apache-site bugdb.cgi
marc99/10/08 10:33:13 Modified:.bugdb.cgi Log: Update bugdb script to refer people to the swish-e bugdb search form first. It is far more efficient and far more useful for the vast majority of people, despite a few problems like not always display the title of the PR in the search results. Revision ChangesPath 1.43 +41 -1 apache-site/bugdb.cgi Index: bugdb.cgi === RCS file: /export/home/cvs/apache-site/bugdb.cgi,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- bugdb.cgi 1999/05/24 17:55:50 1.42 +++ bugdb.cgi 1999/10/08 17:33:11 1.43 @@ -1699,6 +1699,10 @@ just using our software and we have nothing to do with them. Don't waste your time or ours by telling us about it. /LI +LIDo NOT submit a problem report without searching the existing ones + first to ensure that the issue you are reporting has not already been + addressed +/LI /UL /STRONG/BIG /TD @@ -1715,8 +1719,44 @@ #EOM #-- # Quick query +print EOT; + +PHRP +H2Search the Apache problem report database by keyword or phrase:/H2 + +P + +The Boolean AND, OR, and NOT are supported. The asterisk (*) can be +used as a truncation character. If you enter multiple words +iwithout/i an AND or an OR they are automagically iAND/Ied +together. The search is not case sensitive. Email addresses and other +words with a dot, a dash, a hyphen or an '\@' sign are taken as one +searchable token. Thus you are istrongly/i encouraged to use +asterisk '*' completion. + +FORM ACTION=http://search.apache.org/; METHOD=POST + +PINPUT TYPE=text NAME=keyword SIZE=50 + +P + +Maximum number of records to return: +select name=results +option value=2020 +option value=20100 +option value=20200 +/select + +input name=what value=bugs type=hidden + +P +INPUT TYPE=submit VALUE=Start Search + +/FORM +EOT print PhrP\n; -print Use the following form to search the problem report database. ; +print Alternatively, if you have a more specific query you can use\n; +print the following form to search the problem report database. ; print Narrow your search by specifying a value for one or more a href=\$GNUINFOSCRIPT?(gnats)Problem%20Report%20fields\problem report fields/a.\n; print PFORM ACTION=\$SCRIPT_NAME/quick\\n;
cvs commit: apache-2.0/src/lib/apr/network_io/win32 networkio.h sockets.c sockopt.c
manoj 99/10/08 14:28:48
Modified:src/lib/apr/network_io/beos networkio.h sockets.c sockopt.c
src/lib/apr/network_io/os2 networkio.h sockets.c sockopt.c
src/lib/apr/network_io/unix sockopt.c
src/lib/apr/network_io/win32 networkio.h sockets.c sockopt.c
Log:
Get rid of the per-connection name lookup on non-Unix platforms. This
also adds an attempt at correct error handling for gethostbyaddr() for
all platforms. Non-Unix maintainers should check to make sure this is
done right.
Revision ChangesPath
1.3 +0 -1 apache-2.0/src/lib/apr/network_io/beos/networkio.h
Index: networkio.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/networkio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -u -r1.2 -r1.3
--- networkio.h 1999/10/02 23:11:36 1.2
+++ networkio.h 1999/10/08 21:27:37 1.3
@@ -71,7 +71,6 @@
struct socket_t {
ap_context_t *cntxt;
int socketdes;
-char *remote_hostname;
struct sockaddr_in * addr;
int addr_len;
int timeout;
1.6 +0 -10 apache-2.0/src/lib/apr/network_io/beos/sockets.c
Index: sockets.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -u -r1.5 -r1.6
--- sockets.c 1999/10/08 20:04:15 1.5
+++ sockets.c 1999/10/08 21:27:39 1.6
@@ -90,7 +90,6 @@
}
(*new)-socketdes = socket(AF_INET ,SOCK_STREAM, 0);
- (*new)-remote_hostname=NULL;
(*new)-addr-sin_family = AF_INET;
(*new)-addr_len = sizeof(*(*new)-addr);
memset((*new)-addr-sin_zero, 0, sizeof((*new)-addr-sin_zero));
@@ -172,8 +171,6 @@
ap_status_t ap_accept(struct socket_t **new, const struct socket_t *sock)
{
- struct hostent *hptr;
-
(*new) = (struct socket_t *)ap_palloc(sock-cntxt,
sizeof(ap_socket_t));
@@ -189,12 +186,6 @@
return errno;
}
- hptr = gethostbyaddr((char*)(*new)-addr-sin_addr,
- sizeof(struct in_addr), AF_INET);
- if (hptr != NULL){
- (*new)-remote_hostname = strdup(hptr-h_name);
- }
-
ap_register_cleanup((*new)-cntxt, (void *)new,
socket_cleanup, NULL);
return APR_SUCCESS;
@@ -222,7 +213,6 @@
return errno;
}
-sock-remote_hostname = strdup(hostname);
return APR_SUCCESS;
}
1.4 +14 -4 apache-2.0/src/lib/apr/network_io/beos/sockopt.c
Index: sockopt.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -u -r1.3 -r1.4
--- sockopt.c 1999/10/04 16:37:06 1.3
+++ sockopt.c 1999/10/08 21:27:41 1.4
@@ -58,6 +58,7 @@
#include sys/socket.h
#include unistd.h
#include fcntl.h
+#include netdb.h
#include networkio.h
#include apr_network_io.h
#include apr_general.h
@@ -102,9 +103,18 @@
ap_status_t ap_get_remote_hostname(char **name, struct socket_t *sock)
{
-(*name) = (char*)ap_pstrdup(sock-cntxt, sock-remote_hostname);
-if (*name) {
-return APR_SUCCESS;
+struct hostent *hptr;
+
+hptr = gethostbyaddr((char *)(sock-addr-sin_addr),
+ sizeof(struct in_addr), AF_INET);
+if (hptr != NULL) {
+*name = ap_pstrdup(sock-cntxt, hptr-h_name);
+if (*name) {
+return APR_SUCCESS;
+}
+return APR_ENOMEM;
}
-return APR_ENOMEM;
+
+/* XXX - Is this threadsafe? - manoj */
+return h_errno;
}
1.2 +0 -1 apache-2.0/src/lib/apr/network_io/os2/networkio.h
Index: networkio.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/networkio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -u -r1.1 -r1.2
--- networkio.h 1999/08/17 15:59:43 1.1
+++ networkio.h 1999/10/08 21:27:52 1.2
@@ -62,7 +62,6 @@
struct socket_t {
ap_context_t *cntxt;
int socketdes;
-char *remote_hostname;
struct sockaddr_in *addr;
int addr_len;
};
1.3 +0 -10 apache-2.0/src/lib/apr/network_io/os2/sockets.c
Index: sockets.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockets.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -u -r1.2 -r1.3
---
