>Number: 3586 >Category: general >Synopsis: 2 of 3 Apache v1.3.3 official patches do not apply cleanly to >a virgin distribution >Confidential: no >Severity: non-critical >Priority: medium >Responsible: apache >State: open >Class: sw-bug >Submitter-Id: apache >Arrival-Date: Fri Dec 25 12:50:00 PST 1998 >Last-Modified: >Originator: [EMAIL PROTECTED] >Organization: apache >Release: 1.3.3 >Environment: SPARC/SunOS 5.5.1 (sun4c) This problem is precompile so the compiler version is irrelevant. I used patch v2.1 and patch v2.5 to attempt to apply the patches. >Description: The core_404_log_bug and server_error_filename patches for Apache v1.3.3 do not apply cleanly to a virgin copy of Apache v1.3.3.
When patching http_main.c with core_404_log_bug.txt (using FSF patch v2.5), I get =-=-=-=-=-= The text leading up to this was: -------------------------- |Index: main/http_core.c |=================================================================== |RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v |retrieving revision 1.237 |diff -u -r1.237 http_core.c |--- http_core.c 1998/10/23 20:07:39 1.237 |+++ http_core.c 1998/10/30 02:23:07 -------------------------- File to patch: main/http_core.c patching file `main/http_core.c' Hunk #1 succeeded at 2754 (offset -29 lines). =-=-=-=-= When patching http_protocol.c with server_error_filename.txt, I get =-=-=-=-= The text leading up to this was: -------------------------- |Index: main/http_protocol.c |=================================================================== |RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v |retrieving revision 1.246 |diff -u -r1.246 http_protocol.c |--- http_protocol.c 1998/10/19 05:59:35 1.246 |+++ http_protocol.c 1998/10/30 22:06:36 -------------------------- File to patch: main/http_protocol.c patching file `main/http_protocol.c' Hunk #2 FAILED at 2390. 1 out of 2 hunks FAILED -- saving rejects to main/http_protocol.c.rej =-=-=-=-= The rejected patch can be apply with a -F 3 flag but you might want check to see if you can apply the patches to a virgin distribution or you might want to replace the current versions of the patches with copies that do apply cleanly. >How-To-Repeat: see full description >Fix: see full description >Audit-Trail: >Unformatted: [In order for any reply to be added to the PR database, ] [you need to include <[EMAIL PROTECTED]> in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ]
