fielding 99/01/03 05:35:33
Modified: . STATUS
src CHANGES
src/include httpd.h
Log:
Change the ap_assert macro to a variant that works on all platforms.
PR: 2575
Submitted by: Richard Prinz <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding, Dirk-Willem van Gulik
Revision Changes Path
1.585 +1 -5 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- STATUS 1999/01/02 13:30:20 1.584
+++ STATUS 1999/01/03 13:35:29 1.585
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/01/02 13:30:20 $]
+ Last modified at [$Date: 1999/01/03 13:35:29 $]
Release:
@@ -123,10 +123,6 @@
* Ronald Tschalär's ap_uuencode() bugfix
Message-ID: PR#3411
Status: Lars +1 (on concept)
-
- * PR#2575 problem with ap_assert macro
- Message-ID: <[EMAIL PROTECTED]>
- Status:
* Michael van Elst's patch [PR#3160] to improve mod_rewrite's
in-core cache handling by using a hash table.
1.1198 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1197
retrieving revision 1.1198
diff -u -r1.1197 -r1.1198
--- CHANGES 1999/01/03 13:09:46 1.1197
+++ CHANGES 1999/01/03 13:35:30 1.1198
@@ -1,5 +1,8 @@
Changes with Apache 1.3.4
+ *) Change the ap_assert macro to a variant that works on all platforms.
+ [Richard Prinz <[EMAIL PROTECTED]>] PR#2575
+
*) In order to prevent some errant library code from setting an alarm
on one request and having it affect some later connection, force the
alarm to be cleared before each connection even if Apache's own
1.257 +1 -1 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- httpd.h 1999/01/01 19:04:41 1.256
+++ httpd.h 1999/01/03 13:35:32 1.257
@@ -1080,7 +1080,7 @@
*/
API_EXPORT(void) ap_log_assert(const char *szExp, const char *szFile, int
nLine)
__attribute__((noreturn));
-#define ap_assert(exp) (void)( (exp) || (ap_log_assert(#exp, __FILE__,
__LINE__), 0) )
+#define ap_assert(exp) ((exp) ? (void)0 :
ap_log_assert(#exp,__FILE__,__LINE__))
/* The optimized timeout code only works if we're not MULTITHREAD and we're
* also not using a scoreboard file
