cvs commit: apache-1.3/htdocs index.html.it
dirkx 99/08/20 02:35:45 Added: htdocs index.html.it Log: Welcome to italy. Revision ChangesPath 1.1 apache-1.3/htdocs/index.html.it Index: index.html.it === !doctype html public -//w3c//dtd html 4.0 transitional//en html head meta http-equiv=Content-Type content=text/html; charset=iso-8859-1 titlePagina di prova dell'installazione di un sito Web con Apache/title !-- Background white, links blue (unvisited), navy (visited), red (active) -- /head body text=#00 bgcolor=#FF link=#FF vlink=#80 alink=#FF center h1 Funziona! Il Server Web Apache e' stato installato su questo sito Web!/h1/center Se riuscite a vedere questa pagina, allora vuol dire che coloro che gestiscono questo dominio hanno appena installato il software a href=http://www.apache.org/httpd/;Webnbsp;Server Apache/a correttamente. Ora e' necessario aggiungere il vostro materiale in questo direttorio e sostituire questa pagina di prova, oppure configurare il server per far riferimento al vostro materiale se collocato altrove. p hr blockquoteSe state vedendo questa pagina invece del sito che pensavate, vi preghiamo di bcontattare l'amministratore del sito in questione./b (Provate ad inviare un email a ttlt;Webmaster@idomain/i/tt.)nbsp; Nonostante questo sito stia utilizzando il software Apache, questo non vi garantisce nessun tipo di contatto diretto al Gruppo Apache, quindi vi preghiamo di non inviare email riguardanti questo sito o al materiale in esso contenuto agli autori di Apache. Ogni messaggio del genere verra' bfont size=+1ignorato/font/b./blockquote hr brLa a href=manual/index.htmldocumentazione/a relativa di Apache e' inclusa nella distribuzione. pIl Webmaster di questo sito e' libero di utilizzare l'immagine qui sotto su qualsiasi Web server potenziato con Apache. Grazie per aver scelto Apache! center pimg SRC=apache_pb.gif ALT= /center /body /html
cvs commit: apache-1.3 STATUS
bjh 99/08/20 02:39:27 Modified:.STATUS Log: OS/2 binaries uploaded. Revision ChangesPath 1.751 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.750 retrieving revision 1.751 diff -u -r1.750 -r1.751 --- STATUS1999/08/19 09:07:29 1.750 +++ STATUS1999/08/20 09:39:22 1.751 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/19 09:07:29 $] + Last modified at [$Date: 1999/08/20 09:39:22 $] Release: @@ -487,7 +487,7 @@ mips-sgi-irix6.2 no Lars Eilebrecht mips-sgi-irix6.4 no Lars Eilebrecht mips-sni-svr4 no Martin Kraemer - OS/2 no Brian Havard + OS/2 yes Brian Havard powerpc-apple-rhapsody5.3 no Wilfredo Sanchez rs6000-ibm-aix3.2.5 no Sameer Parekh rs6000-ibm-aix4.1 no Lars Eilebrecht
cvs commit: apache-site/dist HEADER.html
coar99/08/20 05:24:32 Modified:dist HEADER.html Log: Oops; not on the how-to-release list, so I forgot to do it.. Thanks, Ask! Revision ChangesPath 1.8 +5 -6 apache-site/dist/HEADER.html Index: HEADER.html === RCS file: /home/cvs/apache-site/dist/HEADER.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- HEADER.html 1999/03/23 23:57:12 1.7 +++ HEADER.html 1999/08/20 12:24:31 1.8 @@ -1,9 +1,8 @@ -H2Make sure you're downloading from A HREF=http://www.apache.org/dyn/closer.cgi; -a nearby mirror site!/A/H2 - +H2Make sure you're downloading from + A HREF=http://www.apache.org/dyn/closer.cgi; a nearby mirror site!/A/H2 +p If you're having trouble accessing these files, there's probably a closer mirror to you.BR A HREF=http://www.apache.org/dyn/closer.cgi;Go here to find it./A -H2 - A HREF=Announcement.htmlApache 1.3.6/A is now available. -/H2 +/p +H2A HREF=Announcement.htmlApache 1.3.9/A is now available./H2
cvs commit: apache-1.3 KEYS
randy 99/08/20 09:57:28 Modified:.KEYS Log: Update key. Revision ChangesPath 1.25 +8 -3 apache-1.3/KEYS Index: KEYS === RCS file: /home/cvs/apache-1.3/KEYS,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- KEYS 1999/08/16 22:46:42 1.24 +++ KEYS 1999/08/20 16:57:18 1.25 @@ -190,9 +190,10 @@ Type Bits/KeyIDDate User ID pub 1024/631B5749 1996/06/21 Randy Terbush [EMAIL PROTECTED] + Randy Terbush [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- -Version: 2.6.3 +Version: 2.6.3ia mQCNAzHLBS8AAAEEANGFXb9o0NPVfVjSLvQh1j3fN6cMeVNA5BGUJ6HZGP/NDxTE i8hwejJqakkU4ux/g6Kqckrx3h8WR7OXZZ+R8CsA0bg9Sr42ndEQCUISgArg+lXZ @@ -200,8 +201,12 @@ tCFSYW5keSBUZXJidXNoIDxyYW5keUB6eXp6eXZhLmNvbT6JAJUDBRAxywUwqKsN 4GMbV0kBAegnA/sH63WyfwMFmn3nWe8T/5IXO/QkMYoMGLS1i7IxMY9O8BVvKQM+ oxEcJdFAG7zPZkpgKzTBxmExz5hMZ9hwJ42XhrslWoP7JVvADJcdthrUAYW9W+jx -GcDYAW3qW5DpKsQchfvXq9QOBDxP+Kbbe2B8xGEyGUhLkacISFTrIhhQSg== -=8P8s +GcDYAW3qW5DpKsQchfvXq9QOBDxP+Kbbe2B8xGEyGUhLkacISFTrIhhQSrQiUmFu +ZHkgVGVyYnVzaCA8cmFuZHlAY292YWxlbnQubmV0PokAlQMFEDXwEhioqw3gYxtX +SQEBnaED/1AJCYW7jKCtBaZZLhp5TRtYSQxBMTmT2b4bDE4mbTb0VtDgpfrp5yOu +xTtJxiQ53jIenv58qYLMhVBUsuMjWjnTVtNF6531n0T6v/K0ByNmUqKwStH/8qLX +i+I4VWinALYcSOZDxranDey+1oVyw0NpvJMFFEhF0fmPRlSpaq5c +=x5FB -END PGP PUBLIC KEY BLOCK- Type Bits/KeyIDDate User ID
cvs commit: apache-2.0/mpm/src/modules/mpm/winnt winnt.h winnt.c
stoddard99/08/20 13:20:34
Modified:mpm/src/modules/mpm/winnt winnt.h winnt.c
Log:
Use AcceptEx (a.k.a. accept and receive) on windows NT. Begin work to make
the WIN9x code co-exist with the NT specific code. Since I started this work,
I've managed to improve the static page serving performance of Apache on NT by
almost 50%. Still a long way from Apache on Linux though.
TODO:
- Reuse the AcceptEx accept socket (performance)
- Clean up the organization of the winnt mpm
- Implement Async AcceptEx and Receive. Will this break modules?
- File handle cache (file i/o accounts for more than 50% of the time per
request)
- TransmitFile (I have prototype code implemented). Should we add a send_file
API
to the I/O control layer? Maybe Apache should always try to send_file.
Platforms
that don't support send_file could in turn, invoke the appropriate buff code
which would then invoke socket iol write/writev.
Revision ChangesPath
1.2 +11 -0 apache-2.0/mpm/src/modules/mpm/winnt/winnt.h
Index: winnt.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/winnt/winnt.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- winnt.h 1999/08/05 21:08:25 1.1
+++ winnt.h 1999/08/20 20:20:32 1.2
@@ -64,4 +64,15 @@
extern int ap_extended_status;
extern void clean_child_exit(int);
+typedef struct CompContext {
+OVERLAPPED Overlapped;
+SOCKET accept_socket;
+BUFF* conn_io;
+pool *ptrans;
+struct sockaddr sa_server;
+int sa_server_len;
+struct sockaddr sa_client;
+int sa_client_len;
+} COMP_CONTEXT, *PCOMP_CONTEXT;
+
#endif /* APACHE_MPM_WINNT_H */
1.9 +281 -214 apache-2.0/mpm/src/modules/mpm/winnt/winnt.c
Index: winnt.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/winnt/winnt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- winnt.c 1999/08/17 22:05:17 1.8
+++ winnt.c 1999/08/20 20:20:33 1.9
@@ -70,6 +70,7 @@
#include ../os/win32/getopt.h
#include mpm_default.h
#include ../os/win32/iol_socket.h
+#include winnt.h
/*
* Definitions of WINNT MPM specific config globals
@@ -80,7 +81,6 @@
static int ap_threads_per_child = 0;
static int workers_may_exit = 0;
static int max_requests_per_child = 0;
-static int requests_this_child;
static struct pollfd *listenfds;
static int num_listenfds = 0;
@@ -248,12 +248,7 @@
}
/*
- * Routines to deal with managing the list of listening sockets...
- * find_ready_listener()
- * Finds a listener which is ready for accept(). This advances
- * the head_listener global.
- * setup_listeners()
- * setup_inherited_listeners()
+ * Routines to deal with managing the list of listening sockets.
*/
static ap_listen_rec *head_listener;
static ap_inline ap_listen_rec *find_ready_listener(fd_set * main_fds)
@@ -431,15 +426,6 @@
* process is active at once.
**/
-/* The code protected by #ifdef UNGRACEFUL_RESTARTS/#endif sections
- * could implement a sort-of ungraceful restart for Win32. instead of
- * graceful restarts.
- *
- * However it does not work too well because it does not intercept a
- * connection already in progress (in child_sub_main()). We'd have to
- * get that to poll on the exit event.
- */
-
int service_init()
{
/*
@@ -473,20 +459,15 @@
*/
typedef struct globals_s {
-#ifdef UNGRACEFUL_RESTART
-HANDLE thread_exit_event;
-#else
-int exit_now;
-#endif
semaphore *jobsemaphore;
joblist *jobhead;
joblist *jobtail;
-mutex *jobmutex;
+CRITICAL_SECTION jobmutex;
int jobcount;
} globals;
globals allowed_globals =
-{0, NULL, NULL, NULL, NULL, 0};
+{NULL, NULL, NULL, NULL, 0};
/*
* add_job()/remove_job() - add or remove an accepted socket from the
@@ -494,19 +475,19 @@
* against multiple concurrent access to the linked list of jobs.
*/
-void add_job(int sock)
+static void add_job(int sock)
{
joblist *new_job;
-ap_assert(allowed_globals.jobmutex);
-/* TODO: If too many jobs in queue, sleep, check for problems */
-ap_acquire_mutex(allowed_globals.jobmutex);
new_job = (joblist *) malloc(sizeof(joblist));
if (new_job == NULL) {
fprintf(stderr, Ouch! Out of memory in add_job()!\n);
+return;
}
new_job-next = NULL;
new_job-sock = sock;
+
+EnterCriticalSection(allowed_globals.jobmutex);
if (allowed_globals.jobtail != NULL)
allowed_globals.jobtail-next = new_job;
allowed_globals.jobtail = new_job;
@@
cvs commit: apache-1.3/htdocs index.html.ee index.html.lu
martin 99/08/20 13:28:51 Modified:htdocs index.html.ee index.html.lu Log: Minor typos Revision ChangesPath 1.2 +1 -1 apache-1.3/htdocs/index.html.ee Index: index.html.ee === RCS file: /export/home/cvs/apache-1.3/htdocs/index.html.ee,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html.ee 1999/08/19 13:09:43 1.1 +++ index.html.ee 1999/08/20 20:28:46 1.2 @@ -17,7 +17,7 @@ /H1 P Kui Sa nauml;ed seda lehekuuml;lge, siis selle domeeni omanikud on - edukalt hakkama saanud A HREF=http://www.apache.org/httpd/;Apache veebiserveri/A + edukalt hakkama saanud A HREF=http://www.apache.org/httpd;Apache veebiserveri/A installeerimisega. Jauml;rgmiseks peaks nad selle lehekuuml;lje asendama misiganes materjaliga, mida nad oma veebisaidis nauml;idata tahavad, votilde;i siis juhatama veebiserverile kauml;tte tegeliku materjali 1.2 +3 -3 apache-1.3/htdocs/index.html.lu Index: index.html.lu === RCS file: /export/home/cvs/apache-1.3/htdocs/index.html.lu,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html.lu 1999/08/19 13:09:43 1.1 +++ index.html.lu 1999/08/20 20:28:47 1.2 @@ -12,15 +12,15 @@ h1 Et huet geklappt! Den Apache Web Server as op deuml;ser 'Web Site' installeiert!/h1/center Wann Dir die heiten Sait gesit, dann hun d'Proprietairen vun deuml;ser 'domain' -elo just d'a href=http://www.apache.org/httpd/;Apache Web server/a software +elo just d'a href=http://www.apache.org/httpd;Apache Web server/a software mat succeacute;s installeiert. Sie mussen allerdengs nach des Decksait remplaceieren oder awer de Server op eng aner Sait mat dem richtigen contenu em-dirigeieren. br hr blockquoteWann Dir die heiten Sait anstell vun der site die Dir erwacirc;rt -hut gesitt, da contacteiert wannechglift denb administrator vun dem betraffener -site./b (Versicht eacute;n email no ttlt;Webmaster@idomain/i /ttfont face=Times New Roman,Timesze +hut gesitt, da contacteiert wannechglift den badministrator vun dem betraffener +site./b (Versicht eacute;n email no ttlt;Webmaster@idomain/igt; /ttfont face=Times New Roman,Timesze schecken.) Obwuel den heiten site /fontApache software benotzt, as et ball secher datt keng Verbindung mat der Apache Group existeiert, also scheckt wannechglift keng email iwert desen site oder sein contenu zu den Apache
cvs commit: apache-devsite binaries.html
lars99/08/20 14:25:31 Modified:.binaries.html Log: no more sunos 4.1.4 Revision ChangesPath 1.21 +0 -1 apache-devsite/binaries.html Index: binaries.html === RCS file: /export/home/cvs/apache-devsite/binaries.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- binaries.html 1999/06/02 10:19:08 1.20 +++ binaries.html 1999/08/20 21:25:30 1.21 @@ -175,7 +175,6 @@ LIsparc-sun-solaris2.5:Lars Eilebrecht LIsparc-sun-solaris2.6:Lars Eilebrecht, Ralf S. Engelschall LIsparc-sun-solaris2.7: Cliff Skolnick -LIsparc-sun-sunos4.1.4:Lars Eilebrecht LIsparc-sun-sunos4.1.3_U1: Sameer Parekh /UL
cvs commit: apache-1.3 STATUS
lars99/08/20 14:28:16 Modified:.STATUS Log: just uploaded some binaries dists. Revision ChangesPath 1.752 +3 -5 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.751 retrieving revision 1.752 diff -u -r1.751 -r1.752 --- STATUS1999/08/20 09:39:22 1.751 +++ STATUS1999/08/20 21:28:13 1.752 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/20 09:39:22 $] + Last modified at [$Date: 1999/08/20 21:28:13 $] Release: @@ -473,7 +473,6 @@ i686-unknown-linux2 no Lars Eilebrecht i686-whatever-linux2 no Ken Coar i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass - i386-unknown-netBSD-1.2.1 N/A Lars Eilebrecht i386-unknown-netBSD-1.3.2 no Lars Eilebrecht i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie @@ -482,7 +481,7 @@ m88k-dg-dgux5.4R2.01 no Sameer parekh m88k-next-nextno Rob Hartill mips-dec-ultrix4.4no Sameer Parekh - mips-unknown-linuxno Lars Eilebrecht + mips-unknown-linuxyes Lars Eilebrecht mips-sgi-irix5.3 no Mark Imbrianco mips-sgi-irix6.2 no Lars Eilebrecht mips-sgi-irix6.4 no Lars Eilebrecht @@ -494,8 +493,7 @@ rs6000-ibm-aix4.2 no Bill Stoddard rs6000-ibm-aix4.3.2 no Bill Stoddard sparc-sun-solaris2.5 no Lars Eilebrecht - sparc-sun-solaris2.6 no Lars Eilebrecht + sparc-sun-solaris2.6 yes Lars Eilebrecht sparc-sun-solaris2.7 no Cliff Skolnick - sparc-sun-sunos4.1.4 no Lars Eilebrecht, Michael Douglass sparc-sun-sunos4.1.3_U1 no Sameer Parekh sparc-unknown-linux no Lars Eilebrecht
cvs commit: apache-1.3 STATUS
randy 99/08/20 15:54:03 Modified:.STATUS Log: New binary distributions available. These names don't match the names generated by GuessOS. May I please fix this? Revision ChangesPath 1.753 +20 -13apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.752 retrieving revision 1.753 diff -u -r1.752 -r1.753 --- STATUS1999/08/20 21:28:13 1.752 +++ STATUS1999/08/20 22:54:01 1.753 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/20 21:28:13 $] + Last modified at [$Date: 1999/08/20 22:54:01 $] Release: @@ -457,43 +457,50 @@ Platform Avail. Volunteer -- alpha-dec-osf3.0 no Sameer Parekh - alpha-dec-osf4.0 no Lars Eilebrecht, Ken Coar + alpha-dec-osf4.0 yes Lars Eilebrecht, Ken Coar, Randy Terbush + alpha-whatever-linux2 yes Randy Terbush armv4l-whatever-linux2no Rasmus Lerdorf - hppa1.1-hp-hpux no Rob Hartill + hppa1.1-hp-hpux-10.x yes Rob Hartill, Randy Terbush i386-slackware-linux(a.out) no Sameer Parekh i386-sun-solaris2.5 no Sameer Parekh + i386-sun-solaris2.6 yes Randy Terbush i386-sun-solaris2.7 no Cliff Skolnick - i386-unixware-svr4no Sameer Parekh + i386-unixware-svr4yes Sameer Parekh, Randy Terbush i386-unknown-freebsd2.1 no Andrew Wilson, Brian Tao i386-unknown-freebsd2.2.8 no Jim Jagielski i386-whatever-freebsd3.0 no Ken Coar i386-whatever-freebsd3.0 no Dirk-Willem van Gulik i686-pc-freebsd3.1no Ralf S. Engelschall - i586-unknown-linux2 no Ralf S. Engelschall, Lars Eilebrecht + i586-unknown-linux2 yes Ralf S. Engelschall, Lars Eilebrecht, Randy Terbush i686-unknown-linux2 no Lars Eilebrecht - i686-whatever-linux2 no Ken Coar + i686-whatever-linux2 yes Ken Coar, Randy Terbush i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass - i386-unknown-netBSD-1.3.2 no Lars Eilebrecht + i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht, Randy Terbush i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie i386-sni-svr4 no Martin Kraemer + i386-dg-dgux5.4R2.01 yes Randy Terbush + x86-qnx-4.x yes Randy Terbush + x86-bsdos-3.x yes Randy Terbush + x86-bsdos-4.x yes Randy Terbush + x86-openbsd-2.x yes Randy Terbush m68k-apple-aux3.1.1 no Jim Jagielski m88k-dg-dgux5.4R2.01 no Sameer parekh m88k-next-nextno Rob Hartill mips-dec-ultrix4.4no Sameer Parekh mips-unknown-linuxyes Lars Eilebrecht - mips-sgi-irix5.3 no Mark Imbrianco - mips-sgi-irix6.2 no Lars Eilebrecht + mips-sgi-irix5.3 yes Mark Imbrianco, Randy Terbush + mips-sgi-irix6.2 yes Lars Eilebrecht, Randy Terbush mips-sgi-irix6.4 no Lars Eilebrecht mips-sni-svr4 no Martin Kraemer OS/2 yes Brian Havard powerpc-apple-rhapsody5.3 no Wilfredo Sanchez rs6000-ibm-aix3.2.5 no Sameer Parekh rs6000-ibm-aix4.1 no Lars Eilebrecht - rs6000-ibm-aix4.2 no Bill Stoddard - rs6000-ibm-aix4.3.2 no Bill Stoddard - sparc-sun-solaris2.5 no Lars Eilebrecht + rs6000-ibm-aix4.2 yes Bill Stoddard + rs6000-ibm-aix4.3.x yes Bill Stoddard, Randy Terbush + sparc-sun-solaris2.5 yes Lars Eilebrecht, Randy Terbush sparc-sun-solaris2.6 yes Lars Eilebrecht sparc-sun-solaris2.7 no Cliff Skolnick sparc-sun-sunos4.1.3_U1 no Sameer Parekh - sparc-unknown-linux no Lars Eilebrecht + sparc-unknown-linux yes Lars Eilebrecht, Randy Terbush
