cvs commit: apache-1.3/src/helpers GuessOS
wsanchez99/07/29 22:14:09
Modified:src/helpers GuessOS
Log:
Change Power Macintosh to Power* so if uname prints Power Book we're
still happy.
Revision ChangesPath
1.61 +1 -1 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- GuessOS 1999/05/03 23:07:45 1.60
+++ GuessOS 1999/07/30 05:14:08 1.61
@@ -243,7 +243,7 @@
Rhapsody:*:*:*)
case ${MACHINE} in
- Power Macintosh) MACHINE=powerpc ;;
+ Power*) MACHINE=powerpc ;;
esac
echo ${MACHINE}-apple-rhapsody${RELEASE}; exit 0
;;
cvs commit: apache-1.3/htdocs/manual/misc howto.html
rse 99/07/30 02:51:03 Modified:htdocs/manual/misc howto.html Log: Fix PR#4720 Revision ChangesPath 1.12 +3 -2 apache-1.3/htdocs/manual/misc/howto.html Index: howto.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/howto.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- howto.html1999/04/21 05:01:24 1.11 +++ howto.html1999/07/30 09:51:01 1.12 @@ -85,8 +85,9 @@ BLOCKQUOTEPRE #!/usr/local/bin/perl -print Status: 302 Moved Temporarily\r -Location: http://www.some.where.else.com/\r\n\r\n;; +print Status: 302 Moved Temporarily\r\n . + Location: http://www.some.where.else.com/\r\n; . + \r\n; /PRE/BLOCKQUOTE/P
cvs commit: apache-1.3 INSTALL
rse 99/07/30 02:53:08 Modified:.INSTALL Log: Typo. PR#4789 Revision ChangesPath 1.58 +1 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /home/cvs/apache-1.3/INSTALL,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- INSTALL 1999/06/23 06:55:25 1.57 +++ INSTALL 1999/07/30 09:53:07 1.58 @@ -326,7 +326,7 @@ this way implicitly enables them itself). Note 1: The --enable-shared option DOES NOT AUTOMATICALLY enable the - module because there are variants like `--enable-shared=all' + module because there are variants like `--enable-shared=max' which should not imply `--enable-module=all'. Note 2: Per default the DSO mechanism is globally disabled, i.e. no
cvs commit: apache-1.3/src/main rfc1413.c
martin 99/07/30 06:42:26
Modified:src/main rfc1413.c
Log:
Change for EBCDIC platforms (TPF and BS2000) to
correctly deal with ASCII/EBCDIC conversions in ident query.
(This is the most obvious bug so I commited it right away. -martin)
Submitted by: David McCreedy [EMAIL PROTECTED]
Reviewed by: Martin Kraemer
Revision ChangesPath
1.28 +6 -0 apache-1.3/src/main/rfc1413.c
Index: rfc1413.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/rfc1413.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rfc1413.c 1999/01/01 19:04:53 1.27
+++ rfc1413.c 1999/07/30 13:42:25 1.28
@@ -147,6 +147,9 @@
ntohs(our_sin-sin_port));
/* send query to server. Handle short write. */
+#ifdef CHARSET_EBCDIC
+ebcdic2ascii(buffer, buffer, buflen);
+#endif
i = 0;
while(i strlen(buffer)) {
int j;
@@ -183,6 +186,9 @@
}
/* RFC1413_USERLEN = 512 */
+#ifdef CHARSET_EBCDIC
+ascii2ebcdic(buffer, buffer, (size_t)i);
+#endif
if (sscanf(buffer, %u , %u : USERID :%*[^:]:%512s, rmt_port,
our_port,
user) != 3 || ntohs(rmt_sin-sin_port) != rmt_port
|| ntohs(our_sin-sin_port) != our_port)
cvs commit: apache-1.3/src/main rfc1413.c
martin 99/07/30 07:06:57
Modified:src/main rfc1413.c
Log:
An important bit I missed in the previous commit: When looking for
the end-of-line, we have to scan for '\012' (instead of '\n'
which on EBCDIC platforms differs from '\012') because at this
stage the line is still raw ASCII.
Thanks to David for reminding me of the omission!
Submitted by: David McCreedy [EMAIL PROTECTED]
Revision ChangesPath
1.29 +6 -2 apache-1.3/src/main/rfc1413.c
Index: rfc1413.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/rfc1413.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rfc1413.c 1999/07/30 13:42:25 1.28
+++ rfc1413.c 1999/07/30 14:06:56 1.29
@@ -171,8 +171,12 @@
*/
i = 0;
-memset(buffer, 0, sizeof(buffer));
-while((cp = strchr(buffer, '\n')) == NULL i sizeof(buffer) - 1) {
+memset(buffer, '\0', sizeof(buffer));
+/*
+ * Note that the strchr function below checks for 10 instead of '\n'
+ * this allows it to work on both ASCII and EBCDIC machines.
+ */
+while((cp = strchr(buffer, '\012')) == NULL i sizeof(buffer) - 1) {
int j;
j = read(sock, buffer+i, (sizeof(buffer) - 1) - i);
if (j 0 errno != EINTR) {
cvs commit: apache-apr/apr/time/unix access.c time.c
rbb 99/07/30 08:36:00
Modified:apr/network_io/unix sockopt.c
apr/signal/unix signal.c
apr/time/unix access.c time.c
Log:
More documentation updates. All I have left to doc now is thread/process. :)
Revision ChangesPath
1.11 +29 -2 apache-apr/apr/network_io/unix/sockopt.c
Index: sockopt.c
===
RCS file: /home/cvs/apache-apr/apr/network_io/unix/sockopt.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sockopt.c 1999/06/09 15:16:14 1.10
+++ sockopt.c 1999/07/30 15:35:52 1.11
@@ -107,7 +107,20 @@
return APR_SUCCESS;
}
-
+/* ***APRDOC
+ * ap_status_t ap_setsocketopt(ap_socket_t *, ap_int32_t , ap_int32_t)
+ *Setup socket options for the specified socket
+ * arg 1) The socket to set up.
+ * arg 2) The option we would like to configure. One of:
+ *APR_SO_DEBUG -- turn on debugging information
+ *APR_SO_KEEPALIVE -- keep connections active
+ *APR_SO_LINGER -- lingers on close if data is present
+ *APR_SO_NONBLOCK -- Turns blocking on/off for socket
+ *APR_SO_REUSEADDR -- The rules used in validating addresses
+ * supplied to bind should allow reuse
+ * of local addresses.
+ * arg 3) Are we turning the option on or off.
+ */
ap_status_t ap_setsocketopt(struct socket_t *sock, ap_int32_t opt,
ap_int32_t on)
{
int one;
@@ -154,7 +167,15 @@
return APR_SUCCESS;
}
-ap_status_t ap_gethostname(ap_context_t *cont, char *buf, int len)
+/* ***APRDOC
+ * ap_status_t ap_gethostname(ap_context_t *, char *, ap_int32_t)
+ *Get name of the current machine
+ * arg 1) The context to use.
+ * arg 2) A buffer to store the hostname in.
+ * arg 3) The maximum length of the hostname that can be stored in the
+ *buffer provided.
+ */
+ap_status_t ap_gethostname(ap_context_t *cont, char *buf, ap_int32_t len)
{
if (gethostname(buf, len) == -1)
return errno;
@@ -162,6 +183,12 @@
return APR_SUCCESS;
}
+/* ***APRDOC
+ * ap_status_t ap_get_remote_hostname(ap_socket_t *, char *)
+ *Get name of the machine we are currently connected to.
+ * arg 1) The socket to examine.
+ * arg 2) A buffer to store the hostname in.
+ */
ap_status_t ap_get_remote_hostname(struct socket_t *sock, char **name)
{
(*name) = ap_pstrdup(sock-cntxt, sock-remote_hostname);
1.3 +25 -4 apache-apr/apr/signal/unix/signal.c
Index: signal.c
===
RCS file: /home/cvs/apache-apr/apr/signal/unix/signal.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- signal.c 1999/07/13 19:51:35 1.2
+++ signal.c 1999/07/30 15:35:55 1.3
@@ -63,15 +63,29 @@
#include signal.h
#endif
-
+/* ***APRDOC
+ * ap_status_t ap_create_signal(ap_context_t *, ap_signum_t)
+ *Create a signal for use later on.
+ * arg 1) The context to operate on.
+ * arg 2) The signal we are creating. One of:
+ *List to come. :)
+ * NOTE: This function must be called before the desired signal can be sent.
+ * This is for Windows to be able to send signals, so your program
+ * won't be portable without it.
+ */
ap_status_t ap_create_signal(ap_context_t *cont, ap_signum_t signum)
{
return APR_SUCCESS;
}
-/* Signals can only be sent to the whole process group because I havne't
- * figured out how to send to individual children on Winodws yet. When
- * that is solved, this will change here.
+/* ***APRDOC
+ * ap_status_t ap_send_signal(ap_context_t *, ap_signum_t)
+ *Send a signal to your process group
+ * arg 1) The context to operate on.
+ * arg 2) The signal we are sending. Same as above list
+ * NOTE: Signals can only be sent to the whole process group because I
haven't
+ *figured out how to send to individual children on Windows yet.
When
+ *that is solved, this will change here.
*/
ap_status_t ap_send_signal(ap_context_t *cont, ap_signum_t signum)
{
@@ -79,6 +93,13 @@
return APR_SUCCESS;
}
+/* ***APRDOC
+ * ap_status_t ap_setup_signal(ap_context_t *, ap_signum_t)
+ *Setup the response when a
cvs commit: apache-apr/apr/threadproc/unix proc.c procsup.c thread.c threadcancel.c threadpriv.c
rbb 99/07/30 11:53:45
Modified:apr/threadproc/unix proc.c procsup.c thread.c threadcancel.c
threadpriv.c
Log:
The final APR doc commit :)
Revision ChangesPath
1.21 +103 -0apache-apr/apr/threadproc/unix/proc.c
Index: proc.c
===
RCS file: /home/cvs/apache-apr/apr/threadproc/unix/proc.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- proc.c1999/07/06 17:01:41 1.20
+++ proc.c1999/07/30 18:53:39 1.21
@@ -66,6 +66,12 @@
#include sys/wait.h
#include unistd.h
+/* ***APRDOC
+ * ap_status_t ap_createprocattr_init(ap_context_t *, ap_procattr_t **)
+ *Create and initialize a new procattr variable
+ * arg 1) The context to use
+ * arg 2) The newly created procattr.
+ */
ap_status_t ap_createprocattr_init(ap_context_t *cont, struct procattr_t
**new)
{
(*new) = (struct procattr_t *)ap_palloc(cont,
@@ -86,6 +92,16 @@
return APR_SUCCESS;
}
+/* ***APRDOC
+ * ap_status_t ap_setprocattr_io(ap_procattr_t *, ap_int32_t, ap_int32_t
+ * ap_int32_t)
+ *Determine if any of stdin, stdout, or stderr should be linked
+ *to pipes when starting a child process.
+ * arg 1) The procattr we care about.
+ * arg 2) Should stdin be a pipe bnack to the parent?
+ * arg 3) Should stdout be a pipe bnack to the parent?
+ * arg 4) Should stderr be a pipe bnack to the parent?
+ */
ap_status_t ap_setprocattr_io(struct procattr_t *attr, ap_int32_t in,
ap_int32_t out, ap_int32_t err)
{
@@ -111,6 +127,14 @@
return APR_SUCCESS;
}
+/* ***APRDOC
+ * ap_status_t ap_setprocattr_dir(ap_procattr_t *, char *)
+ *Set which directory the child process should start executing in.
+ * arg 1) The procattr we care about.
+ * arg 2) Which dir to start in. By default, this is the same dir as
+ *the parent currently resides in, when the createprocess call
+ *is made.
+ */
ap_status_t ap_setprocattr_dir(struct procattr_t *attr,
char *dir)
{
@@ -121,6 +145,14 @@
return APR_ENOMEM;
}
+/* ***APRDOC
+ * ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *, ap_cmdtype_e)
+ *Set what type of command the child process will call.
+ * arg 1) The procattr we care about.
+ * arg 2) The type of command. One of:
+ *APR_SHELLCMD -- Shell script
+ *APR_PROGRAM -- Executable program (default)
+ */
ap_status_t ap_setprocattr_cmdtype(struct procattr_t *attr,
ap_cmdtype_e cmd)
{
@@ -128,12 +160,25 @@
return APR_SUCCESS;
}
+/* ***APRDOC
+ * ap_status_t ap_setprocattr_detach(ap_procattr_t *, ap_int32_t)
+ *Determine if the chlid should start in detached state.
+ * arg 1) The procattr we care about.
+ * arg 2) Should the child start in detached state? Default is no.
+ */
ap_status_t ap_setprocattr_detach(struct procattr_t *attr, ap_int32_t
detach)
{
attr-detached = detach;
return APR_SUCCESS;
}
+/* ***APRDOC
+ * ap_status_t ap_fork_detach(ap_context_t *, ap_proc_t **)
+ *This is currently the only non-portable call in APR. This executes
+ *a standard unix fork.
+ * arg 1) The context to use.
+ * arg 2) The resulting process handle.
+ */
ap_status_t ap_fork(ap_context_t *cont, struct proc_t **proc)
{
int pid;
@@ -153,6 +198,20 @@
return APR_INPARENT;
}
+/* ***APRDOC
+ * ap_status_t ap_create_process(ap_context_t *, char *, char *const [],
+ char **, ap_procattr_t *, ap_proc_t **)
+ *Create a new process and execute a new program within that process.
+ * arg 1) The context to use.
+ * arg 2) The program to run
+ * arg 3) the arguments to pass to the new program. The first one should
+ *be the program name.
+ * arg 4) The new environment table for the new process. This should be a
+ *list of NULL-terminated strings.
+ * arg 5) the procattr we should use to determine how to create the new
+ *process
+ * arg 6) The resulting process handle.
+ */
ap_status_t ap_create_process(ap_context_t *cont, char *progname,
char *const args[], char **env,
struct procattr_t *attr,
cvs commit: apache-1.3/src/include ap_config.h
wsanchez99/07/30 13:58:58 Modified:src/include ap_config.h Log: Get rid of redefinition warning Revision ChangesPath 1.264 +1 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- ap_config.h 1999/07/21 11:57:09 1.263 +++ ap_config.h 1999/07/30 20:58:56 1.264 @@ -390,6 +390,7 @@ #endif #elif defined(MAC_OS) || defined(MAC_OS_X_SERVER) /* Mac OS (= 10.0) and Mac OS X Server (= 5.x) */ +#undef PLATFORM #ifdef MAC_OS_X_SERVER #define PLATFORM Mac OS X Server #else
Re: cvs commit: apache-2.0/mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c
[EMAIL PROTECTED] wrote: manoj 99/07/29 13:06:20 Modified:mpm/src/modules/mpm/dexter dexter.c mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c Log: Use Ben Hyde's warning fix on two other MPMs. Tch! Ben Laurie! Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
