Apply the 10x patch first, then the mod_ssl patch. Identify the
conflicts. For each conflict, examine the corresponding parts of the
10x patch and mod_ssl patches individually to determine the reason each
changed that code. Then merge the conflicts by hand.
For example, the 10x patches rewrite sections of buff.c to make better
use of writev. The mod_ssl patches modify the same sections to
redirect network I/O system calls through ssl wrappers. These conflict,
and the answer is to edit the code yourself to honor the intent of both
patches. Where 10x changes write to writev, you must change the mod_ssl
modification similarly.
I recall there being only one or two places requiring any thought. The
rest should be fairly straightforward.
--
Michael J. Abbott mja@xxxxxxx www.repbot.org/mike
|