cvs commit: apachen/src/os/win32 main_win32.c
akosut 97/11/24 20:07:13
Modified:src Apache.dsp Apache.mak
src/main http_main.c
Added: src/os/win32 main_win32.c
Removed: src/main dummy.c
Log:
Move the Win32 main() function out of ApacheCore.dll. Replace it
with an apache_main(), which is called by a main() function in
os/win32/main_win32.c.
Reviewed by: Ben Laurie
Revision ChangesPath
1.7 +1 -1 apachen/src/Apache.dsp
Index: Apache.dsp
===
RCS file: /export/home/cvs/apachen/src/Apache.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- Apache.dsp1997/10/20 20:19:07 1.6
+++ Apache.dsp1997/11/25 04:07:09 1.7
@@ -86,7 +86,7 @@
# PROP Default_Filter cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90
# Begin Source File
-SOURCE=.\main\dummy.c
+SOURCE=.\os\win32\main_win32.c
# End Source File
# End Group
# Begin Group Header Files
1.7 +6 -6 apachen/src/Apache.mak
Index: Apache.mak
===
RCS file: /export/home/cvs/apachen/src/Apache.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- Apache.mak1997/10/20 20:19:08 1.6
+++ Apache.mak1997/11/25 04:07:09 1.7
@@ -47,7 +47,7 @@
!ENDIF
CLEAN :
- [EMAIL PROTECTED] $(INTDIR)\dummy.obj
+ [EMAIL PROTECTED] $(INTDIR)\main_win32.obj
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(OUTDIR)\Apache.exe
@@ -68,7 +68,7 @@
/incremental:no /pdb:$(OUTDIR)\Apache.pdb /machine:I386\
/out:$(OUTDIR)\Apache.exe
LINK32_OBJS= \
- $(INTDIR)\dummy.obj
+ $(INTDIR)\main_win32.obj
$(OUTDIR)\Apache.exe : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @
@@ -94,7 +94,7 @@
!ENDIF
CLEAN :
- [EMAIL PROTECTED] $(INTDIR)\dummy.obj
+ [EMAIL PROTECTED] $(INTDIR)\main_win32.obj
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(INTDIR)\vc50.pdb
[EMAIL PROTECTED] $(OUTDIR)\Apache.exe
@@ -118,7 +118,7 @@
/incremental:yes /pdb:$(OUTDIR)\Apache.pdb /debug /machine:I386\
/out:$(OUTDIR)\Apache.exe
LINK32_OBJS= \
- $(INTDIR)\dummy.obj
+ $(INTDIR)\main_win32.obj
$(OUTDIR)\Apache.exe : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @
@@ -159,9 +159,9 @@
!IF $(CFG) == Apache - Win32 Release || $(CFG) == Apache - Win32
Debug
-SOURCE=.\main\dummy.c
+SOURCE=.\os\win32\main_win32.c
-$(INTDIR)\dummy.obj : $(SOURCE) $(INTDIR)
+$(INTDIR)\main_win32.obj : $(SOURCE) $(INTDIR)
$(CPP) $(CPP_PROJ) $(SOURCE)
1.254 +5 -1 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -u -r1.253 -r1.254
--- http_main.c 1997/11/22 02:04:44 1.253
+++ http_main.c 1997/11/25 04:07:11 1.254
@@ -4264,8 +4264,12 @@
return (0);
}
+#ifdef WIN32
__declspec(dllexport)
- int main(int argc, char *argv[])
+ int apache_main(int argc, char *argv[])
+#else
+int main(int argc, char *argv[])
+#endif
{
int c;
int child = 0;
1.1 apachen/src/os/win32/main_win32.c
Index: main_win32.c
===
/* main_win32.c - Apache executable stub file for Win32
* This file's purpose in life is to load, and call the
* real main function, apache_main(), located in ApacheCore.dll
*
* This was done because having the main() function in a DLL,
* although Win32 allows it, seemed wrong. Also, MSVC++ won't
* link an executable without at least one object file. This
* satistifies that requirement.
*/
__declspec(dllexport) int apache_main(int argc, char *argv[]);
int main(int argc, char *argv[])
{
apache_main(argc, argv);
}
cvs commit: apachen/htdocs/manual install.html
pcs 97/11/25 01:41:46 Modified:.README htdocs/manual install.html Log: Revision ChangesPath 1.13 +1 -1 apachen/README Index: README === RCS file: /export/home/cvs/apachen/README,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- README1997/10/19 17:05:04 1.12 +++ README1997/11/25 09:41:44 1.13 @@ -53,7 +53,7 @@ Finally, make a call to httpd, with a -f to the full path to the httpd.conf file. I.e., the common case: - /usr/local/etc/apache/src/httpd -f /usr/local/etc/apache/conf/httpd.conf + /usr/local/apache/src/httpd -f /usr/local/apache/conf/httpd.conf And voila! The server should be running. 1.16 +2 -2 apachen/htdocs/manual/install.html Index: install.html === RCS file: /export/home/cvs/apachen/htdocs/manual/install.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- install.html 1997/10/25 22:35:07 1.15 +++ install.html 1997/11/25 09:41:46 1.16 @@ -169,7 +169,7 @@ location with the -f argument. For example: PRE -/usr/local/etc/apache/src/httpd -f /usr/local/etc/apache/conf/httpd.conf +/usr/local/apache/src/httpd -f /usr/local/apache/conf/httpd.conf /PRE If all goes well this will return to the command prompt almost @@ -228,7 +228,7 @@ the parent. A typical command to stop the server is: PRE -kill -TERM `cat /usr/local/etc/apache/logs/httpd.pid` +kill -TERM `cat /usr/local/apache/logs/httpd.pid` /PRE P
cvs commit: apachen/htdocs/manual install.html
pcs 97/11/25 01:47:48 Modified:.README htdocs/manual install.html Log: Fix the default Apache path Revision ChangesPath 1.14 +1 -1 apachen/README Index: README === RCS file: /export/home/cvs/apachen/README,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- README1997/11/25 09:41:44 1.13 +++ README1997/11/25 09:47:47 1.14 @@ -53,7 +53,7 @@ Finally, make a call to httpd, with a -f to the full path to the httpd.conf file. I.e., the common case: - /usr/local/apache/src/httpd -f /usr/local/apache/conf/httpd.conf + /usr/local/apache/httpd -f /usr/local/apache/conf/httpd.conf And voila! The server should be running. 1.17 +1 -1 apachen/htdocs/manual/install.html Index: install.html === RCS file: /export/home/cvs/apachen/htdocs/manual/install.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- install.html 1997/11/25 09:41:46 1.16 +++ install.html 1997/11/25 09:47:47 1.17 @@ -169,7 +169,7 @@ location with the -f argument. For example: PRE -/usr/local/apache/src/httpd -f /usr/local/apache/conf/httpd.conf +/usr/local/apache/httpd -f /usr/local/apache/conf/httpd.conf /PRE If all goes well this will return to the command prompt almost
cvs commit: apachen/src/main http_main.c
ben 97/11/25 12:43:34
Modified:src CHANGES
src/main http_main.c
Log:
Fix scoreboard allocation size.
Submitted by: Dean Gaudet
Revision ChangesPath
1.520 +3 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- CHANGES 1997/11/23 18:10:02 1.519
+++ CHANGES 1997/11/25 20:43:30 1.520
@@ -1,5 +1,8 @@
Changes with Apache 1.3b4
+ *) WIN32: Allocate the correct amount of memory for the scoreboard.
+ [Dean Gaudet]
+
*) WIN32: Only lowercase the part of the path that is real. [Ben Laurie]
*) Fix problems with timeouts in inetd mode and -X mode. [Dean Gaudet]
1.255 +2 -1 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- http_main.c 1997/11/25 04:07:11 1.254
+++ http_main.c 1997/11/25 20:43:32 1.255
@@ -1248,7 +1248,8 @@
void reinit_scoreboard(pool *p)
{
ap_assert(!scoreboard_image);
-scoreboard_image = (scoreboard *) calloc(HARD_SERVER_LIMIT,
sizeof(short_score));
+scoreboard_image = (scoreboard *) malloc(SCOREBOARD_SIZE);
+memset(scoreboard_image, 0, SCOREBOARD_SIZE);
}
void cleanup_scoreboard()
cvs commit: apachen/src CHANGES
dgaudet 97/11/25 13:36:52 Modified:src CHANGES Log: attribute the PR#1387 fix to Ben Hyde Revision ChangesPath 1.521 +1 -1 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.520 retrieving revision 1.521 diff -u -r1.520 -r1.521 --- CHANGES 1997/11/25 20:43:30 1.520 +++ CHANGES 1997/11/25 21:36:51 1.521 @@ -1,7 +1,7 @@ Changes with Apache 1.3b4 *) WIN32: Allocate the correct amount of memory for the scoreboard. - [Dean Gaudet] + [Ben Hyde] PR#1387 *) WIN32: Only lowercase the part of the path that is real. [Ben Laurie]
