Commit 487ad3e6 authored by dgaudet's avatar dgaudet
Browse files

Add the slack fd code, and the reordering of log/socket opening. 

Reviewed by:
Submitted by:
Obtained from:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78374 13f79535-47bb-0310-9956-ffa450edef68
parent 2ddc2c6d

APACHE_1_2_X/src/CHANGES

+18 −1
Original line number Diff line number Diff line 
Changes with Apache 1.2.1



  *) Attempt to work around problems with third party libraries that do not

     handle high numbered descriptors (examples include bind, and

     solaris libc).  On all systems apache attempts to keep all permanent

     descriptors above 15 (called the low slack line).  Solaris users

     can also benefit from adding -DHIGH_SLACK_LINE=256 to EXTRA_CFLAGS

     which keeps all non-FILE * descriptors above 255.  On all systems

     this should make supporting large numbers of vhosts with many open

     log files more feasible.  If this causes trouble please report it,

     you can disable this workaround by adding -DNO_SLACK to EXTRA_CFLAGS.

     [Dean Gaudet] various PRs



  *) Related to the last entry, network sockets are now opened before

     log files are opened.  The only known case where this can cause

     problems is under Solaris with many virtualhosts and many Listen

     directives.  But using -DHIGH_SLACK_LINE=256 described above will

     work around this problem.  [Dean Gaudet]



  *) pregsub had an off-by-1 in its error checking code. [Alexei Kosut]



Changes with Apache 1.2

APACHE_1_2_X/src/PORTING

+3 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ build for your OS. 
      NO_LINGCLOSE:

       Do not use Apache's soft, "lingering" close feature to

       terminate connections.

      NO_SLACK:

       Do not use the "slack" fd feature which requires a working fcntl

       F_DUPFD.

--



  MISC #DEFINES:

APACHE_1_2_X/src/include/ap_config.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
extern void GETPRIVMODE();

extern void GETUSERMODE();

extern char *inet_ntoa();

#define NO_SLACK



#elif defined(SUNOS4)

#define HAVE_GMTOFF

APACHE_1_2_X/src/include/conf.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
extern void GETPRIVMODE();

extern void GETUSERMODE();

extern char *inet_ntoa();

#define NO_SLACK



#elif defined(SUNOS4)

#define HAVE_GMTOFF

APACHE_1_2_X/src/include/http_config.h

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ module *find_linked_module (const char *name); 
/* For http_main.c... */



server_rec *read_config (pool *conf_pool, pool *temp_pool, char *config_name);

void init_modules(pool *p, server_rec *s);

void setup_prelinked_modules();

void show_directives();

void show_modules();