Commit 1c754d57 authored by dgaudet's avatar dgaudet
Browse files

LockFile directive and USE_FLOCK changes. 


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

APACHE_1_2_X/src/CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ Changes with Apache 1.2.1 
     to the rule that symlink permissions are tested with the symlink

     options of the parent directory.  [Dean Gaudet] PR#353



  *) CONFIG: The LockFile directive can be used to place the serializing

     lockfile in any location.  It previously defaulted to /usr/tmp/htlock.

     [Somehow it took three of us: Jim Jaglieski, Dean Gaudet, Marc Slemko]



  *) QUERY_STRING was unescaped in mod_include, it shouldn't be.

     [Dean Gaudet] PR#644
@@ -48,6 +52,9 @@ Changes with Apache 1.2.1 
     directives.  But using -DHIGH_SLACK_LINE=256 described above will

     work around this problem.  [Dean Gaudet]



  *) USE_FLOCK_SERIALIZED_ACCEPT is now default for FreeBSD, A/UX, and

     SunOS 4.



  *) Improved unix error response logging.  [Marc Slemko]



  *) Update mod_rewrite from 3.0.5 to 3.0.6.  New ruleflag

APACHE_1_2_X/src/include/ap_config.h

+5 −3
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ char *mktemp(char *template); 
typedef int rlim_t;

#define memmove(a,b,c) bcopy(b,a,c)

#define NO_LINGCLOSE

#define USE_FLOCK_SERIALIZED_ACCEPT



#elif defined(SOLARIS2)

#undef HAVE_GMTOFF
@@ -317,16 +318,16 @@ extern char *crypt(); 
#define NEED_STRDUP

#define JMP_BUF sigjmp_buf

/* fcntl() locking is expensive with NFS */

#undef USE_FLOCK_SERIALIZED_ACCEPT

#define USE_FLOCK_SERIALIZED_ACCEPT

#define HAVE_SHMGET

#define MOVEBREAK		0x4000000

/*

 * NOTE: If when you run Apache under A/UX and you get a warning

 * that httpd couldn't move break, then the above value for

 * that httpd couldn't move break, then the below value for

 * MOVEBREAK (64megs) is too large for your setup. Try reducing

 * to 0x2000000 which is still PLENTY of space. I doubt if

 * even on heavy systems sbrk() would be called at all...

 */

#define MOVEBREAK		0x4000000

#define NO_LINGCLOSE

#define NO_SLACK
@@ -411,6 +412,7 @@ extern char *crypt(); 
(defined(__FreeBSD_version) && (__FreeBSD_version < 220000))

typedef quad_t rlim_t;

#endif

#define USE_FLOCK_SERIALIZED_ACCEPT



#elif defined(QNX)

#ifndef crypt

APACHE_1_2_X/src/include/conf.h

+5 −3
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ char *mktemp(char *template); 
typedef int rlim_t;

#define memmove(a,b,c) bcopy(b,a,c)

#define NO_LINGCLOSE

#define USE_FLOCK_SERIALIZED_ACCEPT



#elif defined(SOLARIS2)

#undef HAVE_GMTOFF
@@ -317,16 +318,16 @@ extern char *crypt(); 
#define NEED_STRDUP

#define JMP_BUF sigjmp_buf

/* fcntl() locking is expensive with NFS */

#undef USE_FLOCK_SERIALIZED_ACCEPT

#define USE_FLOCK_SERIALIZED_ACCEPT

#define HAVE_SHMGET

#define MOVEBREAK		0x4000000

/*

 * NOTE: If when you run Apache under A/UX and you get a warning

 * that httpd couldn't move break, then the above value for

 * that httpd couldn't move break, then the below value for

 * MOVEBREAK (64megs) is too large for your setup. Try reducing

 * to 0x2000000 which is still PLENTY of space. I doubt if

 * even on heavy systems sbrk() would be called at all...

 */

#define MOVEBREAK		0x4000000

#define NO_LINGCLOSE

#define NO_SLACK
@@ -411,6 +412,7 @@ extern char *crypt(); 
(defined(__FreeBSD_version) && (__FreeBSD_version < 220000))

typedef quad_t rlim_t;

#endif

#define USE_FLOCK_SERIALIZED_ACCEPT



#elif defined(QNX)

#ifndef crypt

APACHE_1_2_X/src/include/http_conf_globals.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ extern int suexec_enabled; 


extern char *pid_fname;

extern char *scoreboard_fname;

extern char *lock_fname;

extern char *server_argv0;



/* Trying to allocate these in the config pool gets us into some *nasty*

APACHE_1_2_X/src/include/httpd.h

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ 
#endif

#define DEFAULT_PIDLOG "logs/httpd.pid"

#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"

#define DEFAULT_LOCKFILE "logs/accept.lock"



/* Define this to be what your HTML directory content files are called */

#define DEFAULT_INDEX "index.html"