svn commit: r1822500 - in /httpd/httpd/trunk: CHANGES server/main.c

[ic...@apache.org]

Author: icing
Date: Mon Jan 29 11:40:25 2018
New Revision: 1822500

URL: http://svn.apache.org/viewvc?rev=1822500&view=rev
Log:
On the trunk:

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


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/main.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1822500&r1=1822499&r2=1822500&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Jan 29 11:40:25 2018
@@ -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.
 

Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=1822500&r1=1822499&r2=1822500&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Mon Jan 29 11:40:25 2018
@@ -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;