Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:1611 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 41789 invoked from network); 16 May 2003 20:05:33 -0000 Received: from unknown (HELO vckyb4.nw.wakwak.com) (211.9.231.145) by pb1.pair.com with SMTP; 16 May 2003 20:05:33 -0000 Received: from at.wakwak.com (at.wakwak.com [211.9.230.135:25]) by vckyb4.nw.wakwak.com (Postfix) with ESMTP id A35CF3FE0E for ; Sat, 17 May 2003 05:05:32 +0900 (JST) Received: from at.wakwak.com (z170.219-121-68.ppp.wakwak.ne.jp [219.121.68.170]) by at.wakwak.com (8.12.9/8.12.9/2003-03-31) with SMTP id h4GK5WH5085998 for ; Sat, 17 May 2003 05:05:32 +0900 (JST) (envelope-from moriyoshi@at.wakwak.com) Date: Sat, 17 May 2003 05:08:31 +0900 X-Mailer: EdMax Ver2.85.3F MIME-Version: 1.0 To: php-internal Message-ID: <20030517050831go+Z6o@at.wakwak.com> Content-Type: multipart/mixed; boundary="------------Boundary_o:W8pvdSmYK9_o(" Subject: [PATCH] fix for apache1 syntax highlighter From: moriyoshi@at.wakwak.com (Moriyoshi Koizumi) --------------Boundary_o:W8pvdSmYK9_o( Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Hi, Attached is the patch for apache1 SAPI which fixes the issue that the syntax highter doesn't work with output buffering enabled. The patch simply tries to call php_request_shutdown() even under display_source_mode because php_request_startup() is called anytime in prior to the highlight_file() call. If there are no objections, I'll commit this patch shortly. Regards, Moriyoshi --------------Boundary_o:W8pvdSmYK9_o( Content-Type: text/plain; name="ap1-request-shutdown-patch.diff.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="ap1-request-shutdown-patch.diff.txt" SW5kZXg6IHNhcGkvYXBhY2hlL3NhcGlfYXBhY2hlLmMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL3JlcG9zaXRvcnkvcGhwNC9zYXBpL2FwYWNoZS9zYXBpX2FwYWNoZS5jLHYKcmV0cmll dmluZyByZXZpc2lvbiAxLjQwLjQuMQpkaWZmIC11IC1yMS40MC40LjEgc2FwaV9hcGFjaGUu YwotLS0gc2FwaS9hcGFjaGUvc2FwaV9hcGFjaGUuYwkzMSBEZWMgMjAwMiAxNjoyNjo1OSAt MDAwMAkxLjQwLjQuMQorKysgc2FwaS9hcGFjaGUvc2FwaV9hcGFjaGUuYwkxNiBNYXkgMjAw MyAxOTo1NTo0NSAtMDAwMApAQCAtMjcsNiArMjcsNyBAQAogICovCiBpbnQgYXBhY2hlX3Bo cF9tb2R1bGVfbWFpbihyZXF1ZXN0X3JlYyAqciwgaW50IGRpc3BsYXlfc291cmNlX21vZGUg VFNSTUxTX0RDKQogeworCWludCByZXR2YWwgPSBPSzsJCiAJemVuZF9maWxlX2hhbmRsZSBm aWxlX2hhbmRsZTsKIAogCWlmIChwaHBfcmVxdWVzdF9zdGFydHVwKFRTUk1MU19DKSA9PSBG QUlMVVJFKSB7CkBAIC00MCwxMSArNDEsNyBAQAogCQl6ZW5kX3N5bnRheF9oaWdobGlnaHRl cl9pbmkgc3ludGF4X2hpZ2hsaWdodGVyX2luaTsKIAogCQlwaHBfZ2V0X2hpZ2hsaWdodF9z dHJ1Y3QoJnN5bnRheF9oaWdobGlnaHRlcl9pbmkpOwotCQlpZiAoaGlnaGxpZ2h0X2ZpbGUo U0cocmVxdWVzdF9pbmZvKS5wYXRoX3RyYW5zbGF0ZWQsICZzeW50YXhfaGlnaGxpZ2h0ZXJf aW5pIFRTUk1MU19DQykpewotCQkJcmV0dXJuIE9LOwotCQl9IGVsc2UgewotCQkJcmV0dXJu IE5PVF9GT1VORDsKLQkJfQorCQlyZXR2YWwgPSBoaWdobGlnaHRfZmlsZShTRyhyZXF1ZXN0 X2luZm8pLnBhdGhfdHJhbnNsYXRlZCwgJnN5bnRheF9oaWdobGlnaHRlcl9pbmkgVFNSTUxT X0NDKTsKIAl9IGVsc2UgewogCQlmaWxlX2hhbmRsZS50eXBlID0gWkVORF9IQU5ETEVfRklM RU5BTUU7CiAJCWZpbGVfaGFuZGxlLmhhbmRsZS5mZCA9IDA7CkBAIC02MSw3ICs1OCw3IEBA CiAJCXBocF9yZXF1ZXN0X3NodXRkb3duKE5VTEwpOwogCX0gemVuZF9lbmRfdHJ5KCk7CiAJ Ci0JcmV0dXJuIChPSyk7CisJcmV0dXJuIHJldHZhbDsKIH0KIC8qIH19fSAqLwogCg== --------------Boundary_o:W8pvdSmYK9_o(--