cvs commit: apache-2.0/src/modules/mpm/prefork Makefile.am
manoj 99/12/13 22:40:15 Added: src/modules/mpm/prefork Makefile.am Log: Part of the stuff needed to get prefork working with autoconf. Untested. Revision ChangesPath 1.1 apache-2.0/src/modules/mpm/prefork/Makefile.am Index: Makefile.am === noinst_LTLIBRARIES = libprefork.la libprefork_la_SOURCES = prefork.c
cvs commit: apache-2.0/src/lib/apr/lib apr_snprintf.c
rbb 99/12/14 07:28:23
Modified:src/lib/apr/include apr_winconfig.h
src/lib/apr/lib apr_snprintf.c
Log:
Fix a build break in APR.
Revision ChangesPath
1.2 +1 -0 apache-2.0/src/lib/apr/include/apr_winconfig.h
Index: apr_winconfig.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_winconfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_winconfig.h 1999/12/09 21:00:28 1.1
+++ apr_winconfig.h 1999/12/14 15:28:21 1.2
@@ -82,6 +82,7 @@
#define HAVE_CONIO_H 1
#define HAVE_MALLOC_H 1
#define HAVE_STDLIB_H 1
+#define HAVE_LIMITS_H 1
typedef enum {APR_WIN_NT, APR_WIN_95, APR_WIN_98} ap_oslevel_e;
1.7 +3 -0 apache-2.0/src/lib/apr/lib/apr_snprintf.c
Index: apr_snprintf.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_snprintf.c1999/12/13 13:39:23 1.6
+++ apr_snprintf.c1999/12/14 15:28:22 1.7
@@ -76,6 +76,9 @@
#ifdef HAVE_SYS_SOCKET_H
#include sys/socket.h
#endif
+#ifdef HAVE_LIMITS_H
+#include limits.h
+#endif
#ifdef HAVE_STRING_H
#include string.h
#endif
cvs commit: apache-devsite devnotes.html
fanf99/12/14 09:45:17 Modified:.devnotes.html Log: One of my colleages noted that this page recommends using unencrypted ssh keys. It's better to use the ssh-agent. Submitted by: Mike Bristow [EMAIL PROTECTED] Revision ChangesPath 1.13 +6 -5 apache-devsite/devnotes.html Index: devnotes.html === RCS file: /home/cvs/apache-devsite/devnotes.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- devnotes.html 1999/10/12 21:47:08 1.12 +++ devnotes.html 1999/12/14 17:45:17 1.13 @@ -220,11 +220,12 @@ /LI LIOn your local system generate your SSH public key file SAMP~/.ssh/identity.pub/SAMP via SAMPssh-keygen/SAMP and then put -it in SAMP~/.ssh/authorized_keys/SAMP on the repository system. This -will allow you to access the repository without having to enter a password -for each CVS operation. But make sure that you didn't enter a passphrase -when running SAMPssh-keygen/SAMP or you need to enter that one -instead of the password (which would be no gain). +it in SAMP~/.ssh/authorized_keys/SAMP on the repository system. If you +use the SAMPssh-agent/SAMP this will allow you to access the repository +without having to enter a password for each CVS operation. Use +SAMPssh-add/SAMP and enter your passphrase once when you start a +session, and SAMPssh-add -D/SAMP at the end of the session to +delete your unencrypted key from the agent. /LI /OL HR
cvs commit: apache-devsite devnotes.html
fanf99/12/14 09:46:15 Modified:.devnotes.html Log: the agent may have more than one key Revision ChangesPath 1.14 +1 -1 apache-devsite/devnotes.html Index: devnotes.html === RCS file: /home/cvs/apache-devsite/devnotes.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- devnotes.html 1999/12/14 17:45:17 1.13 +++ devnotes.html 1999/12/14 17:46:15 1.14 @@ -225,7 +225,7 @@ without having to enter a password for each CVS operation. Use SAMPssh-add/SAMP and enter your passphrase once when you start a session, and SAMPssh-add -D/SAMP at the end of the session to -delete your unencrypted key from the agent. +delete your unencrypted key(s) from the agent. /LI /OL HR
cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h
rbb 99/12/14 10:11:09
Modified:src/lib/apr configure.in
src/lib/apr/network_io/unix networkio.h
Log:
Fix some warnings when compiling with -Wall
Revision ChangesPath
1.35 +1 -0 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- configure.in 1999/12/06 18:58:18 1.34
+++ configure.in 1999/12/14 18:11:06 1.35
@@ -256,6 +256,7 @@
AC_CHECK_HEADERS(sys/param.h)
AC_CHECK_HEADERS(sys/resource.h)
AC_CHECK_HEADERS(sys/select.h)
+AC_CHECK_HEADERS(sys/sendfile.h)
AC_CHECK_HEADERS(sys/signal.h)
AC_CHECK_HEADERS(sys/socket.h)
AC_CHECK_HEADERS(sys/stat.h)
1.12 +3 -0 apache-2.0/src/lib/apr/network_io/unix/networkio.h
Index: networkio.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- networkio.h 1999/12/04 21:48:34 1.11
+++ networkio.h 1999/12/14 18:11:08 1.12
@@ -101,6 +101,9 @@
#if HAVE_FCNTL_H
#include fcntl.h
#endif
+#if HAVE_SYS_SENDFILE_H
+#include sys/sendfile.h
+#endif
/* End System Headers */
struct socket_t {
cvs commit: apache-2.0/src/lib/apr/file_io/win32 open.c
rbb 99/12/14 10:25:51
Modified:src/lib/apr/file_io/win32 open.c
Log:
Add support for ap_open_stderr
Revision ChangesPath
1.13 +19 -0 apache-2.0/src/lib/apr/file_io/win32/open.c
Index: open.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- open.c1999/12/09 21:00:09 1.12
+++ open.c1999/12/14 18:25:48 1.13
@@ -199,3 +199,22 @@
}
APR_SUCCESS;
}
+
+ap_status_t ap_open_stderr(struct file_t **thefile, ap_context_t *cont)
+{
+(*thefile) = ap_pcalloc(cont, sizeof(ap_os_file_t *));
+if ((*thefile) == NULL) {
+return APR_ENOMEM;
+}
+
+(*thefile)-filehand = GetStdHandle(STD_ERROR_HANDLE);
+(*thefile)-cntxt = cont;
+(*thefile)-fname = NULL;
+(*thefile)-filehand = NULL;
+(*thefile)-stated = 0;
+(*thefile)-buffered = 0;
+(*thefile)-eof_hit = 0;
+
+return APR_SUCCESS;
+}
+
cvs commit: apache-2.0/src/modules/mpm/prefork prefork.c
rbb 99/12/14 12:02:52
Modified:src/modules/mpm/prefork prefork.c
Log:
Make prefork compile.
Revision ChangesPath
1.59 +5 -1 apache-2.0/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- prefork.c 1999/12/03 22:11:31 1.58
+++ prefork.c 1999/12/14 20:02:50 1.59
@@ -1954,7 +1954,11 @@
static void child_main(int child_num_arg)
{
-NET_SIZE_T clen;
+/* XXX replace int with NET_SIZE_T, this is defined in ap_config.h which
+ has macros we can't make visible to this file, but it is the original
+ type for clen.
+*/
+int clen;
struct sockaddr sa_server;
struct sockaddr sa_client;
ap_listen_rec *lr;
cvs commit: apache-2.0/src/modules/standard mod_cgi.c
rbb 99/12/14 12:37:59
Modified:src/modules/standard mod_cgi.c
Log:
Make CGI's work correctly in Apache 2.0. APR wants the first element in the
argument list to be the program name. This is exactly what POSIX requires,
and what Windows wants, but Apache 1.3 would create the arg list, and then
have another function squeeze the program name in later. This patch fixes
that by having mod_cgi put the program name the correct place.
Revision ChangesPath
1.21 +19 -15apache-2.0/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_cgi.c 1999/12/13 20:52:28 1.20
+++ mod_cgi.c 1999/12/14 20:37:58 1.21
@@ -376,32 +376,35 @@
const char *args = r-args;
if (!args || !args[0] || strchr(args, '=')) {
- *argv = NULL;
+numwords = 1;
}
else {
/* count the number of keywords */
-for (x = 0, numwords = 1; args[x]; x++) {
+for (x = 0, numwords = 2; args[x]; x++) {
if (args[x] == '+') {
++numwords;
}
}
-if (numwords APACHE_ARG_MAX) {
-numwords = APACHE_ARG_MAX; /* Truncate args to prevent
overrun */
-}
-*argv = (char **) ap_palloc(p, (numwords + 1) * sizeof(char *));
-
-for (x = 1, idx = 0; x = numwords; x++) {
-w = ap_getword_nulls(p, args, '+');
-ap_unescape_url(w);
-(*argv)[idx++] = ap_escape_shell_cmd(p, w);
-}
-(*argv)[idx] = NULL;
}
+/* Everything is - 1 to account for the first parameter which is the
+ * program name. We didn't used to have to do this, but APR wants it.
+ */
+if (numwords APACHE_ARG_MAX - 1) {
+numwords = APACHE_ARG_MAX - 1; /* Truncate args to prevent
overrun */
+}
+*argv = (char **) ap_palloc(p, (numwords + 2) * sizeof(char *));
+
+for (x = 1, idx = 1; x numwords; x++) {
+w = ap_getword_nulls(p, args, '+');
+ap_unescape_url(w);
+(*argv)[idx++] = ap_escape_shell_cmd(p, w);
+}
+(*argv)[idx] = NULL;
return APR_SUCCESS;
}
-static ap_status_t build_command_line(char **c, request_rec *r, ap_context_t
*p)
+static ap_status_t build_command_line(char **c, request_rec *r, ap_context_t
*p)
{
#ifdef WIN32
char *quoted_filename = NULL;
@@ -522,8 +525,9 @@
couldn't spawn child process: %s, r-filename);
return HTTP_INTERNAL_SERVER_ERROR;
}
+argv[0] = ap_pstrdup(p, command);
/* run the script in its own process */
-else if (run_cgi_child(script_out, script_in, script_err, command,
argv, r, p) != APR_SUCCESS) {
+if (run_cgi_child(script_out, script_in, script_err, command, argv,
r, p) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
couldn't spawn child process: %s, r-filename);
return HTTP_INTERNAL_SERVER_ERROR;
