On the trunk:

core: adding defines to allow interworking with honggfuzz without
     further patches.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1822500 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 02fc68211011c7d12929b0660a8f098b44f173ac..0adbfd547be71ff3bfa99e1e2496660088ca4b08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) core: adding defines to allow interworking with honggfuzz without
+     further patches. [Stefan Eissing, Robert Swiecki]
+
   *) mod_slotmem_shm: Add generation number to shm filename to fix races
      with graceful restarts. PR 62044.
 

diff --git a/server/main.c b/server/main.c
index d0f6b3f808f63d52457a6b0b5e594d609d119b4d..cd12521229e727d2a1ad6246ddf289621b69e88b 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -484,7 +484,11 @@ static void usage(process_rec *process)
     destroy_and_exit_process(process, 1);
 }
 
-int main(int argc, const char * const argv[])
+#ifdef HFND_FUZZING_ENTRY_FUNCTION
+ HFND_FUZZING_ENTRY_FUNCTION(int argc, const char *const *argv)
+#else
+ int main(int argc, const char *const *argv)
+#endif
 {
     char c;
     int showcompile = 0, showdirectives = 0;