From dev-return-47176-apmail-httpd-dev-archive=httpd.apache.org@httpd.apache.org Wed May 04 19:36:15 2005 Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 65526 invoked from network); 4 May 2005 19:36:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 May 2005 19:36:15 -0000 Received: (qmail 85661 invoked by uid 500); 4 May 2005 19:36:54 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 85621 invoked by uid 500); 4 May 2005 19:36:53 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 85538 invoked by uid 99); 4 May 2005 19:36:52 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from force-elite.com (HELO utopia.in.force-elite.com) (216.255.199.145) by apache.org (qpsmtpd/0.28) with ESMTP; Wed, 04 May 2005 12:36:51 -0700 X-AuthUser: chip@force-elite.com Received: from [10.0.0.142] (10.0.0.142:54523) by utopia.in.force-elite.com with [XMail 1.17 (Linux/Ix86) ESMTP Server] id for from ; Wed, 04 May 2005 12:34:00 -0700 Message-ID: <427923A8.4000300@force-elite.com> Date: Wed, 04 May 2005 12:34:00 -0700 From: Paul Querna User-Agent: Mozilla Thunderbird 1.0.2 (Macintosh/20050317) X-Accept-Language: en-us, en MIME-Version: 1.0 To: dev@httpd.apache.org Subject: [PATCH] Add AP_INIT_TAKE_ARGV X-Enigmail-Version: 0.91.0.0 Content-Type: multipart/mixed; boundary="------------040708040009030503080607" X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N This is a multi-part message in MIME format. --------------040708040009030503080607 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Attached is a patch that adds a new configuration command type. It uses the traditional argv/argc. I grew tired of having to make commands more complicated by using RAW_ARGS, when there is no need. The patch includes changing 'IndexOptions' to use the new AP_INIT_TAKE_ARGV, instead of RAW_ARGS. It also adds a minor MMN bump for the new interface. Comments/thoughts/flames/etc welcome... -Paul --------------040708040009030503080607 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="ap_conf_take_argv.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="ap_conf_take_argv.patch" SW5kZXg6IHNlcnZlci9jb25maWcuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzZXJ2ZXIvY29uZmln LmMJKHJldmlzaW9uIDE2ODE2MikKKysrIHNlcnZlci9jb25maWcuYwkod29ya2luZyBjb3B5 KQpAQCAtNjQ4LDYgKzY0OCw4IEBACiAgKiBpbnZva2luZyB0aGUgZnVuY3Rpb24uLi4KICAq LwogCisjZGVmaW5lIEFQX01BWF9BUkdDIDY0CisKIHN0YXRpYyBjb25zdCBjaGFyICppbnZv a2VfY21kKGNvbnN0IGNvbW1hbmRfcmVjICpjbWQsIGNtZF9wYXJtcyAqcGFybXMsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB2b2lkICptY29uZmlnLCBjb25zdCBjaGFyICph cmdzKQogewpAQCAtNjY3LDYgKzY2OSwyMCBAQAogI2VuZGlmCiAgICAgICAgIHJldHVybiBj bWQtPkFQX1JBV19BUkdTKHBhcm1zLCBtY29uZmlnLCBhcmdzKTsKIAorICAgIGNhc2UgVEFL RV9BUkdWOgorICAgICAgICB7CisgICAgICAgICAgICBjaGFyICphcmd2W0FQX01BWF9BUkdD XTsKKyAgICAgICAgICAgIGludCBhcmdjID0gMDsKKworICAgICAgICAgICAgZG8geworICAg ICAgICAgICAgICAgIHcgPSBhcF9nZXR3b3JkX2NvbmYocGFybXMtPnBvb2wsICZhcmdzKTsK KyAgICAgICAgICAgICAgICBhcmd2W2FyZ2NdID0gdzsKKyAgICAgICAgICAgICAgICBhcmdj Kys7CisgICAgICAgICAgICB9IHdoaWxlIChhcmdjIDwgQVBfTUFYX0FSR0MgJiYgKmFyZ3Mg IT0gJ1wwJyk7CisKKyAgICAgICAgICAgIHJldHVybiBjbWQtPkFQX1RBS0VfQVJHVihwYXJt cywgbWNvbmZpZywgYXJnYywgYXJndik7CisgICAgICAgIH0KKwogICAgIGNhc2UgTk9fQVJH UzoKICAgICAgICAgaWYgKCphcmdzICE9IDApCiAgICAgICAgICAgICByZXR1cm4gYXByX3Bz dHJjYXQocGFybXMtPnBvb2wsIGNtZC0+bmFtZSwgIiB0YWtlcyBubyBhcmd1bWVudHMiLApJ bmRleDogbW9kdWxlcy9nZW5lcmF0b3JzL21vZF9hdXRvaW5kZXguYwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBtb2R1bGVzL2dlbmVyYXRvcnMvbW9kX2F1dG9pbmRleC5jCShyZXZpc2lvbiAxNjgx NjIpCisrKyBtb2R1bGVzL2dlbmVyYXRvcnMvbW9kX2F1dG9pbmRleC5jCSh3b3JraW5nIGNv cHkpCkBAIC0zMTIsOCArMzEyLDkgQEAKICAgICByZXR1cm4gTlVMTDsKIH0KIAotc3RhdGlj IGNvbnN0IGNoYXIgKmFkZF9vcHRzKGNtZF9wYXJtcyAqY21kLCB2b2lkICpkLCBjb25zdCBj aGFyICpvcHRzdHIpCitzdGF0aWMgY29uc3QgY2hhciAqYWRkX29wdHMoY21kX3Bhcm1zICpj bWQsIHZvaWQgKmQsIGludCBhcmdjLCBjaGFyICpjb25zdCBhcmd2W10pCiB7CisgICAgaW50 IGk7CiAgICAgY2hhciAqdzsKICAgICBhcHJfaW50MzJfdCBvcHRzOwogICAgIGFwcl9pbnQz Ml90IG9wdHNfYWRkOwpAQCAtMzI0LDEwICszMjUsMTEgQEAKICAgICBvcHRzID0gZF9jZmct Pm9wdHM7CiAgICAgb3B0c19hZGQgPSBkX2NmZy0+aW5jcmVtZW50ZWRfb3B0czsKICAgICBv cHRzX3JlbW92ZSA9IGRfY2ZnLT5kZWNyZW1lbnRlZF9vcHRzOwotICAgIHdoaWxlIChvcHRz dHJbMF0pIHsKKworICAgIGZvciAoaSA9IDA7IGkgPCBhcmdjOyBpKyspIHsKICAgICAgICAg aW50IG9wdGlvbiA9IDA7CisgICAgICAgIHcgPSBhcmd2W2ldOwogCi0gICAgICAgIHcgPSBh cF9nZXR3b3JkX2NvbmYoY21kLT5wb29sLCAmb3B0c3RyKTsKICAgICAgICAgaWYgKCgqdyA9 PSAnKycpIHx8ICgqdyA9PSAnLScpKSB7CiAgICAgICAgICAgICBhY3Rpb24gPSAqKHcrKyk7 CiAgICAgICAgIH0KQEAgLTU1NCw4ICs1NTYsOCBAQAogICAgIEFQX0lOSVRfSVRFUkFURTIo IkFkZEFsdEJ5RW5jb2RpbmciLCBhZGRfYWx0LCBCWV9FTkNPRElORywgRElSX0NNRF9QRVJN UywKICAgICAgICAgICAgICAgICAgICAgICJhbHRlcm5hdGUgZGVzY3JpcHRpdmUgdGV4dCBm b2xsb3dlZCBieSBvbmUgb3IgbW9yZSAiCiAgICAgICAgICAgICAgICAgICAgICAiY29udGVu dCBlbmNvZGluZ3MiKSwKLSAgICBBUF9JTklUX1JBV19BUkdTKCJJbmRleE9wdGlvbnMiLCBh ZGRfb3B0cywgTlVMTCwgRElSX0NNRF9QRVJNUywKLSAgICAgICAgICAgICAgICAgICAgICJv bmUgb3IgbW9yZSBpbmRleCBvcHRpb25zIFsrfC1dW10iKSwKKyAgICBBUF9JTklUX1RBS0Vf QVJHVigiSW5kZXhPcHRpb25zIiwgYWRkX29wdHMsIE5VTEwsIERJUl9DTURfUEVSTVMsCisg ICAgICAgICAgICAgICAgICAgICAgIm9uZSBvciBtb3JlIGluZGV4IG9wdGlvbnMgWyt8LV1b XSIpLAogICAgIEFQX0lOSVRfVEFLRTIoIkluZGV4T3JkZXJEZWZhdWx0Iiwgc2V0X2RlZmF1 bHRfb3JkZXIsIE5VTEwsIERJUl9DTURfUEVSTVMsCiAgICAgICAgICAgICAgICAgICAie0Fz Y2VuZGluZyxEZXNjZW5kaW5nfSB7TmFtZSxTaXplLERlc2NyaXB0aW9uLERhdGV9IiksCiAg ICAgQVBfSU5JVF9JVEVSQVRFKCJJbmRleElnbm9yZSIsIGFkZF9pZ25vcmUsIE5VTEwsIERJ Ul9DTURfUEVSTVMsCkluZGV4OiBpbmNsdWRlL2h0dHBfY29uZmlnLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gaW5jbHVkZS9odHRwX2NvbmZpZy5oCShyZXZpc2lvbiAxNjgxNjIpCisrKyBpbmNs dWRlL2h0dHBfY29uZmlnLmgJKHdvcmtpbmcgY29weSkKQEAgLTU3LDcgKzU3LDggQEAKICAg ICBUQUtFMywJCQkvKio8IHRocmVlIGFyZ3VtZW50cyBvbmx5ICovCiAgICAgVEFLRTIzLAkJ CS8qKjwgdHdvIG9yIHRocmVlIGFyZ3VtZW50cyAqLwogICAgIFRBS0UxMjMsCQkJLyoqPCBv bmUsIHR3byBvciB0aHJlZSBhcmd1bWVudHMgKi8KLSAgICBUQUtFMTMJCQkvKio8IG9uZSBv ciB0aHJlZSBhcmd1bWVudHMgKi8KKyAgICBUQUtFMTMsCQkJLyoqPCBvbmUgb3IgdGhyZWUg YXJndW1lbnRzICovCisgICAgVEFLRV9BUkdWCQkJLyoqPCBhbiBhcmdjIGFuZCBhcmd2IGFy ZSBwYXNzZWQgKi8KIH07CiAvKioKICAqIFRoaXMgc3RydWN0dXJlIGlzIHBhc3NlZCB0byBh IGNvbW1hbmQgd2hpY2ggaXMgYmVpbmcgaW52b2tlZCwKQEAgLTc4LDYgKzc5LDkgQEAKICAg ICAvKiogZnVuY3Rpb24gdG8gY2FsbCBmb3IgYSByYXctYXJncyAqLwogICAgIGNvbnN0IGNo YXIgKigqcmF3X2FyZ3MpIChjbWRfcGFybXMgKnBhcm1zLCB2b2lkICptY29uZmlnLAogCQkJ ICAgICBjb25zdCBjaGFyICphcmdzKTsKKyAgICAvKiogZnVuY3Rpb24gdG8gY2FsbCBmb3Ig YSBhcmd2L2FyZ2MgKi8KKyAgICBjb25zdCBjaGFyICooKnRha2VfYXJndikgKGNtZF9wYXJt cyAqcGFybXMsIHZvaWQgKm1jb25maWcsCisJCQkgICAgIGludCBhcmdjLCBjaGFyICpjb25z dCBhcmd2W10pOwogICAgIC8qKiBmdW5jdGlvbiB0byBjYWxsIGZvciBhIHRha2UxICovCiAg ICAgY29uc3QgY2hhciAqKCp0YWtlMSkgKGNtZF9wYXJtcyAqcGFybXMsIHZvaWQgKm1jb25m aWcsIGNvbnN0IGNoYXIgKncpOwogICAgIC8qKiBmdW5jdGlvbiB0byBjYWxsIGZvciBhIHRh a2UyICovCkBAIC05NCw2ICs5OCw4IEBACiAjIGRlZmluZSBBUF9OT19BUkdTCWZ1bmMubm9f YXJncwogLyoqIFRoaXMgY29uZmlndXJhdGlvbiBkaXJlY3RpdmUgd2lsbCBoYW5kbGUgaXQn cyBvd24gcGFyc2luZyBvZiBhcmd1bWVudHMqLwogIyBkZWZpbmUgQVBfUkFXX0FSR1MJZnVu Yy5yYXdfYXJncworLyoqIFRoaXMgY29uZmlndXJhdGlvbiBkaXJlY3RpdmUgd2lsbCBoYW5k bGUgaXQncyBvd24gcGFyc2luZyBvZiBhcmd1bWVudHMqLworIyBkZWZpbmUgQVBfVEFLRV9B UkdWCWZ1bmMudGFrZV9hcmd2CiAvKiogVGhpcyBjb25maWd1cmF0aW9uIGRpcmVjdGl2ZSB0 YWtlcyAxIGFyZ3VtZW50Ki8KICMgZGVmaW5lIEFQX1RBS0UxCWZ1bmMudGFrZTEKIC8qKiBU aGlzIGNvbmZpZ3VyYXRpb24gZGlyZWN0aXZlIHRha2VzIDIgYXJndW1lbnRzICovCkBAIC0x MDksNiArMTE1LDkgQEAKIC8qKiBtZXRob2Qgb2YgZGVjbGFyaW5nIGEgZGlyZWN0aXZlIHdp dGggcmF3IGFyZ3VtZW50IHBhcnNpbmcgKi8KICMgZGVmaW5lIEFQX0lOSVRfUkFXX0FSR1Mo ZGlyZWN0aXZlLCBmdW5jLCBtY29uZmlnLCB3aGVyZSwgaGVscCkgXAogICAgIHsgZGlyZWN0 aXZlLCB7IC5yYXdfYXJncz1mdW5jIH0sIG1jb25maWcsIHdoZXJlLCBSQVdfQVJHUywgaGVs cCB9CisvKiogbWV0aG9kIG9mIGRlY2xhcmluZyBhIGRpcmVjdGl2ZSB3aXRoIHJhdyBhcmd1 bWVudCBwYXJzaW5nICovCisjIGRlZmluZSBBUF9JTklUX1RBS0VfQVJHVihkaXJlY3RpdmUs IGZ1bmMsIG1jb25maWcsIHdoZXJlLCBoZWxwKSBcCisgICAgeyBkaXJlY3RpdmUsIHsgLnRh a2VfYXJndj1mdW5jIH0sIG1jb25maWcsIHdoZXJlLCBUQUtFX0FSR1YsIGhlbHAgfQogLyoq IG1ldGhvZCBvZiBkZWNsYXJpbmcgYSBkaXJlY3RpdmUgd2hpY2ggdGFrZXMgMSBhcmd1bWVu dCAqLwogIyBkZWZpbmUgQVBfSU5JVF9UQUtFMShkaXJlY3RpdmUsIGZ1bmMsIG1jb25maWcs IHdoZXJlLCBoZWxwKSBcCiAgICAgeyBkaXJlY3RpdmUsIHsgLnRha2UxPWZ1bmMgfSwgbWNv bmZpZywgd2hlcmUsIFRBS0UxLCBoZWxwIH0KQEAgLTE0Niw2ICsxNTUsNyBAQAogCiAjIGRl ZmluZSBBUF9OT19BUkdTICBmdW5jCiAjIGRlZmluZSBBUF9SQVdfQVJHUyBmdW5jCisjIGRl ZmluZSBBUF9UQUtFX0FSR1YgZnVuYwogIyBkZWZpbmUgQVBfVEFLRTEgICAgZnVuYwogIyBk ZWZpbmUgQVBfVEFLRTIgICAgZnVuYwogIyBkZWZpbmUgQVBfVEFLRTMgICAgZnVuYwpAQCAt MTU1LDYgKzE2NSw4IEBACiAgICAgeyBkaXJlY3RpdmUsIGZ1bmMsIG1jb25maWcsIHdoZXJl LCBSQVdfQVJHUywgaGVscCB9CiAjIGRlZmluZSBBUF9JTklUX1JBV19BUkdTKGRpcmVjdGl2 ZSwgZnVuYywgbWNvbmZpZywgd2hlcmUsIGhlbHApIFwKICAgICB7IGRpcmVjdGl2ZSwgZnVu YywgbWNvbmZpZywgd2hlcmUsIFJBV19BUkdTLCBoZWxwIH0KKyMgZGVmaW5lIEFQX0lOSVRf VEFLRV9BUkdWKGRpcmVjdGl2ZSwgZnVuYywgbWNvbmZpZywgd2hlcmUsIGhlbHApIFwKKyAg ICB7IGRpcmVjdGl2ZSwgZnVuYywgbWNvbmZpZywgd2hlcmUsIFRBS0VfQVJHViwgaGVscCB9 CiAjIGRlZmluZSBBUF9JTklUX1RBS0UxKGRpcmVjdGl2ZSwgZnVuYywgbWNvbmZpZywgd2hl cmUsIGhlbHApIFwKICAgICB7IGRpcmVjdGl2ZSwgZnVuYywgbWNvbmZpZywgd2hlcmUsIFRB S0UxLCBoZWxwIH0KICMgZGVmaW5lIEFQX0lOSVRfSVRFUkFURShkaXJlY3RpdmUsIGZ1bmMs IG1jb25maWcsIHdoZXJlLCBoZWxwKSBcCkluZGV4OiBpbmNsdWRlL2FwX21tbi5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIGluY2x1ZGUvYXBfbW1uLmgJKHJldmlzaW9uIDE2ODE2MikKKysrIGlu Y2x1ZGUvYXBfbW1uLmgJKHdvcmtpbmcgY29weSkKQEAgLTk0LDYgKzk0LDcgQEAKICAqICAg ICAgICAgICAgICAgICAgICAgICAgd2l0aCBhcF8gaW4gdGhlIHdpbjMyIG9zLmguCiAgKiAy MDA1MDMwNS4wICgyLjEuNC1kZXYpIGFkZGVkIHBpZCBhbmQgZ2VuZXJhdGlvbiBmaWVsZHMg dG8gd29ya2VyX3Njb3JlCiAgKiAyMDA1MDMwNS4xICgyLjEuNS1kZXYpIGFkZGVkIGFwX3Zo b3N0X2l0ZXJhdGVfZ2l2ZW5fY29ubi4KKyAqIDIwMDUwMzA1LjIgKDIuMS41LWRldikgYWRk ZWQgQVBfSU5JVF9UQUtFX0FSR1YuCiAgKi8KIAogI2RlZmluZSBNT0RVTEVfTUFHSUNfQ09P S0lFIDB4NDE1MDMyMzBVTCAvKiAiQVAyMCIgKi8KQEAgLTEwMSw3ICsxMDIsNyBAQAogI2lm bmRlZiBNT0RVTEVfTUFHSUNfTlVNQkVSX01BSk9SCiAjZGVmaW5lIE1PRFVMRV9NQUdJQ19O VU1CRVJfTUFKT1IgMjAwNTAzMDUKICNlbmRpZgotI2RlZmluZSBNT0RVTEVfTUFHSUNfTlVN QkVSX01JTk9SIDEgICAgICAgICAgICAgICAgICAgICAvKiAwLi4ubiAqLworI2RlZmluZSBN T0RVTEVfTUFHSUNfTlVNQkVSX01JTk9SIDIgICAgICAgICAgICAgICAgICAgICAvKiAwLi4u biAqLwogCiAvKioKICAqIERldGVybWluZSBpZiB0aGUgc2VydmVyJ3MgY3VycmVudCBNT0RV TEVfTUFHSUNfTlVNQkVSIGlzIGF0IGxlYXN0IGEK --------------040708040009030503080607--