cvs commit: apache-apr/pthreads STATUS
manoj 99/01/26 13:37:48 Removed: pthreads STATUS Log: This STATUS file doesn't apply to this code tree; whack it.
cvs commit: apache-apr STATUS
rbb 99/01/26 12:28:31 Modified:.STATUS Log: Update STATUS file for work being done in pthreads port Revision ChangesPath 1.2 +20 -1 apache-apr/STATUS Index: STATUS === RCS file: /home/cvs/apache-apr/STATUS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- STATUS1999/01/21 23:14:25 1.1 +++ STATUS1999/01/26 20:28:30 1.2 @@ -1,5 +1,5 @@ Apache Portable Runtime STATUS: -Last modified at [$Date: 1999/01/21 23:14:25 $] +Last modified at [$Date: 1999/01/26 20:28:30 $] Release: @@ -20,7 +20,18 @@ Available Patches: In progress: +Accept Serialization +Implemented as a blocking queue. 1 accept thread passes connection +to queue (size of queue is config directive, default # of threads). +All other threads block on queue. + +Signal Handling +Investigate signal handling in Apache-pthreads. Currently, we kill +the process when we encounter SIGPIPE, obviously bad. +Modules +Ensure thread safety. Does not include mod_proxy. + Everything Needs patch: @@ -31,6 +42,14 @@ * What the status codes should look like * Various modules aren't pthreads-ready (mod_cgi) * Bringing in the libap stuff + + * Mod_proxy + * Timeouts. (only soft timeouts) + * Check misc thread safety. Make sure UNIX code path mirrors NT path. + * Process/Thread hybridization + * put monitor process back into place. Was removed for initial port, it's +time we make sure the server is running, and if not, start it again. + * Optimize Optimize Optimize FEATURE SET FOR APR
cvs commit: apache-apr/pthreads/src/main http_main.c
rbb 99/01/26 08:59:02
Modified:pthreads/src/main http_main.c
Log:
Removed printf debugging logic
Revision ChangesPath
1.3 +0 -18 apache-apr/pthreads/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-apr/pthreads/src/main/http_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- http_main.c 1999/01/22 16:10:55 1.2
+++ http_main.c 1999/01/26 16:59:01 1.3
@@ -914,8 +914,6 @@
else
ap_snprintf(addr, sizeof(addr), "port %d", ntohs(server->sin_port));
-printf("make_sock: addr = %s\n", addr);
-
/* note that because we're about to slack we don't use psocket */
if ((s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
ap_log_error(APLOG_MARK, APLOG_CRIT, server_conf,
@@ -1097,9 +1095,7 @@
static int find_listener(listen_rec *lr)
{
listen_rec *or;
-printf("find_listener: in find_listener...\n");
for (or = old_listeners; or; or = or->next) {
-printf("find_listener: or->fd = %d\n", or->fd);
if (!memcmp(&or->local_addr, &lr->local_addr, sizeof(or->local_addr))) {
or->index = 1;
return or->fd;
@@ -1134,7 +1130,6 @@
num_listenfds = 0;
for (;;) {
fd = find_listener(lr);
-printf("setup_listeners: fd = %d\n", fd);
if (fd == NULL) {
fd = make_sock(p, &lr->local_addr);
}
@@ -1143,7 +1138,6 @@
}
if (fd) {
++num_listenfds;
-printf("fd = %d\n", fd);
}
lr->fd = fd;
if (lr->next == NULL)
@@ -1161,7 +1155,6 @@
listenfds[i].events = POLLIN;
listenfds[i].revents = 0;
}
-printf ("leaving setup_listeners\n");
#ifdef NO_SERIALIZED_ACCEPT
/* warn them about the starvation problem if they're using multiple
* sockets
@@ -1343,11 +1336,8 @@
int csd = 0; /* filedesc */
ulong len = sizeof(struct sockaddr);
-printf("in accept_loop\n");
-
pthread_mutex_lock(&accept_loop_lock);
for(;;) {
-printf("num_listenfds = %d\n", num_listenfds);
if (num_listenfds > 1) {
/* more than one socket */
@@ -1381,7 +1371,6 @@
else {
/* only one socket, just pretent we did the other stuff */
sd = ap_listeners->fd;
-printf("ap_listeners->fd = %d\n", ap_listeners->fd);
}
csd = accept(sd, sa_client, &len);
@@ -1814,21 +1803,16 @@
server_conf = ap_read_config(pconf, ptemp, ap_server_confname);
setup_listeners(pconf);
-printf("out of setup_listenersin one_config_cycle\n");
ap_open_logs(server_conf, pconf);
ap_log_pid(pconf, ap_pid_fname);
ap_set_version();
-printf ("set the version\n");
ap_init_modules(pconf, server_conf);
-printf ("init'ed modules\n");
-
version_locked++;
if (!is_graceful) {
reinit_scoreboard(pconf);
}
-printf ("about to setup signals\n");
set_signals();
@@ -1870,8 +1854,6 @@
/* XXX: we child_init once per process... */
ap_child_init_modules(pconf, server_conf);
-
-printf("HEading into server main loop\n");
server_main_loop(remaining_children_to_start);
cvs commit: apache-1.3/src/support htpasswd.dsp htpasswd.mak
coar99/01/26 08:46:29 Modified:src Makefile.nt Added: src/support htpasswd.dsp htpasswd.mak Log: The last bit of the MD5/DES password encryption work: make it compile on Win32. Submitted by: Ken Parzygnat <[EMAIL PROTECTED]>, Ryan Bloom <[EMAIL PROTECTED]> Reviewed by: Ken Coar Revision ChangesPath 1.30 +3 -0 apache-1.3/src/Makefile.nt Index: Makefile.nt === RCS file: /home/cvs/apache-1.3/src/Makefile.nt,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Makefile.nt 1998/11/01 08:56:34 1.29 +++ Makefile.nt 1999/01/26 16:46:25 1.30 @@ -55,6 +55,9 @@ cd ap nmake /nologo CFG="ap - Win32 %LONG%" -f ap.mak cd .. + cd support + nmake /nologo CFG="htpasswd - Win32 %LONG%" -f htpasswd.mak + cd .. cd main nmake /nologo CFG="gen_uri_delims - Win32 %LONG%" -f gen_uri_delims.mak nmake /nologo CFG="gen_test_char - Win32 %LONG%" -f gen_test_char.mak 1.1 apache-1.3/src/support/htpasswd.dsp Index: htpasswd.dsp === # Microsoft Developer Studio Project File - Name="htpasswd" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=htpasswd - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "htpasswd.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "htpasswd.mak" CFG="htpasswd - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "htpasswd - Win32 Release" (based on\ "Win32 (x86) Console Application") !MESSAGE "htpasswd - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "htpasswd - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF # Begin Target # Name "htpasswd - Win32 Release" # Name "htpasswd - Win32 Debug" # Begin Source File SOURCE=..\ap\ap_md5c.c # End Source File # Begin Source File SOURCE=.\htpasswd.c # End Source File # End Target # End Project 1.1 apache-1.3/src/support/htpasswd.mak Index: htpasswd.mak =
cvs commit: apache-site related_projects.html
mjc 99/01/26 08:07:22 Modified:.related_projects.html Log: Fix broken link to RedHat Revision ChangesPath 1.37 +1 -1 apache-site/related_projects.html Index: related_projects.html === RCS file: /export/home/cvs/apache-site/related_projects.html,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- related_projects.html 1999/01/25 16:39:41 1.36 +++ related_projects.html 1999/01/26 16:07:19 1.37 @@ -232,7 +232,7 @@ Red Hat Secure Server -The http://www.redhat.com/products/product-details.phtml?id=rhsa";> +The http://www.redhat.com/product.phtml/WB2000";> Red Hat Secure Server is an integration of the popular Apache web server with the award-winning Red Hat Linux OS that has RSA key technology, and it's the out-of-the-box answer to your secure web serving needs. Shop, sell, and
cvs commit: apache-site/contributors index.html
brian 99/01/25 23:03:09 Modified:contributors index.html Log: Update my info. Revision ChangesPath 1.63 +9 -11 apache-site/contributors/index.html Index: index.html === RCS file: /home/cvs/apache-site/contributors/index.html,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- index.html1999/01/20 05:22:40 1.62 +++ index.html1999/01/26 07:03:08 1.63 @@ -27,7 +27,7 @@ Activities Brian Behlendorf - Listowner, all around ass-kicker. + Various, focusing on infrastructure for development. Ken Coar HTML pedant, FAQ editor, UI perfectionist, bugdb script @@ -150,17 +150,15 @@ Name: Brian Behlendorf -Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] or mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] +Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] URL: http://www.behlendorf.com/";>http://www.behlendorf.com -Organization: C2Net -Occupation: VP Web Apps -Location: Oakland, CA, USA -Comments: Crotchety Old Man who likes to see things done right. -OS Expertise: FreeBSD 2.2.X -Contributions: I focus more on testing and sanity checking, and - I provide the hardware/software/bandwidth to support - http://www.apache.org/";>www.apache.org and the - development mailing list. +Organization: http://www.oreilly.com";>O'Reilly and Associates +Occupation: CTO, New Ventures +Location: San Francisco, CA, USA +Comments: Infrastructure, baby! +OS Expertise: FreeBSD +Contributions: Various, focusing on assisting the development + process itself.
cvs commit: apache-1.3/src/modules/standard mod_auth_db.c mod_auth_dbm.c
manoj 99/01/25 16:15:22 Modified:src/modules/standard mod_auth_db.c mod_auth_dbm.c Log: Minor compilation bugfix Revision ChangesPath 1.38 +1 -1 apache-1.3/src/modules/standard/mod_auth_db.c Index: mod_auth_db.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -u -r1.37 -r1.38 --- mod_auth_db.c 1999/01/25 22:55:38 1.37 +++ mod_auth_db.c 1999/01/26 00:15:21 1.38 @@ -96,7 +96,7 @@ #include "http_log.h" #include "http_protocol.h" #include -#include "ap_md5.h"; +#include "ap_md5.h" #if defined(HAVE_CRYPT_H) #include #endif 1.43 +1 -1 apache-1.3/src/modules/standard/mod_auth_dbm.c Index: mod_auth_dbm.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth_dbm.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -u -r1.42 -r1.43 --- mod_auth_dbm.c1999/01/25 22:55:39 1.42 +++ mod_auth_dbm.c1999/01/26 00:15:21 1.43 @@ -75,7 +75,7 @@ #include "http_log.h" #include "http_protocol.h" #include -#include "ap_md5.h"; +#include "ap_md5.h" #if defined(HAVE_CRYPT_H) #include #endif
