Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:46444 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 57211 invoked from network); 16 Dec 2009 15:20:21 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Dec 2009 15:20:21 -0000 Authentication-Results: pb1.pair.com smtp.mail=jerome@loyet.net; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=jerome@loyet.net; sender-id=unknown Received-SPF: error (pb1.pair.com: domain loyet.net from 209.85.223.195 cause and error) X-PHP-List-Original-Sender: jerome@loyet.net X-Host-Fingerprint: 209.85.223.195 mail-iw0-f195.google.com Received: from [209.85.223.195] ([209.85.223.195:39830] helo=mail-iw0-f195.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id A9/5D-13001-3BAF82B4 for ; Wed, 16 Dec 2009 10:20:20 -0500 Received: by iwn33 with SMTP id 33so748552iwn.29 for ; Wed, 16 Dec 2009 07:20:17 -0800 (PST) MIME-Version: 1.0 Received: by 10.231.121.93 with SMTP id g29mr1143724ibr.13.1260976817627; Wed, 16 Dec 2009 07:20:17 -0800 (PST) Date: Wed, 16 Dec 2009 16:20:17 +0100 Message-ID: <3bea96c40912160720n5cd1f67ftdaae57b2722de676@mail.gmail.com> To: php-dev Cc: Antony Dovgal Content-Type: multipart/mixed; boundary=0016e646926a48e198047ada0b25 Subject: [PATCH] typo: make arguments list clearer From: jerome@loyet.net (=?ISO-8859-1?B?Suly9G1lIExveWV0?=) --0016e646926a48e198047ada0b25 Content-Type: text/plain; charset=ISO-8859-1 Hi tony, here is a patch which makes php-fpm consistent about command line arguments. As php-fpm won't handle file execution from command line, it's not necessary to let extra or wrong arguments to be used. With this patch, it returns usage() if it's not a valid arg. ++ Jerome --0016e646926a48e198047ada0b25 Content-Type: text/plain; name="php-fpm.optarg_clean.patch.txt" Content-Disposition: attachment; filename="php-fpm.optarg_clean.patch.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g3a8x7iv0 SW5kZXg6IHNhcGkvZnBtL2ZwbS9mcG1fbWFpbi5jCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHNhcGkvZnBtL2Zw bS9mcG1fbWFpbi5jCShy6XZpc2lvbiAyOTIyMDcpCisrKyBzYXBpL2ZwbS9mcG0vZnBtX21haW4u YwkoY29waWUgZGUgdHJhdmFpbCkKQEAgLTE0NSwyNiArMTQ1LDE2IEBACiBzdGF0aWMgemVuZF9t b2R1bGVfZW50cnkgY2dpX21vZHVsZV9lbnRyeTsKIAogc3RhdGljIGNvbnN0IG9wdF9zdHJ1Y3Qg T1BUSU9OU1tdID0gewotCXsnYScsIDAsICJpbnRlcmFjdGl2ZSJ9LAotCXsnQycsIDAsICJuby1j aGRpciJ9LAogCXsnYycsIDEsICJwaHAtaW5pIn0sCiAJeydkJywgMSwgImRlZmluZSJ9LAogCXsn ZScsIDAsICJwcm9maWxlLWluZm8ifSwKLQl7J2YnLCAxLCAiZmlsZSJ9LAogCXsnaCcsIDAsICJo ZWxwIn0sCiAJeydpJywgMCwgImluZm8ifSwKLQl7J2wnLCAwLCAic3ludGF4LWNoZWNrIn0sCiAJ eydtJywgMCwgIm1vZHVsZXMifSwKIAl7J24nLCAwLCAibm8tcGhwLWluaSJ9LAotCXsncScsIDAs ICJuby1oZWFkZXIifSwKLQl7J3MnLCAwLCAic3ludGF4LWhpZ2hsaWdodCJ9LAotCXsncycsIDAs ICJzeW50YXgtaGlnaGxpZ2h0aW5nIn0sCi0Jeyd3JywgMCwgInN0cmlwIn0sCiAJeyc/JywgMCwg InVzYWdlIn0sLyogaGVscCBhbGlhcyAoYm90aCAnPycgYW5kICd1c2FnZScpICovCiAJeyd2Jywg MCwgInZlcnNpb24ifSwKIAl7J3knLCAxLCAiZnBtLWNvbmZpZyJ9LAotCXsneicsIDEsICJ6ZW5k LWV4dGVuc2lvbiJ9LAotCXsnVCcsIDEsICJ0aW1pbmcifSwKIAl7Jy0nLCAwLCBOVUxMfSAvKiBl bmQgb2YgYXJncyAqLwogfTsKIApAQCAtOTcxLDI5ICs5NjEsMTggQEAKIAkJcHJvZyA9ICJwaHAi OwogCX0KIAotCXBocF9wcmludGYoCSJVc2FnZTogJXMgWy1xXSBbLWhdIFstc10gWy12XSBbLWld IFstZiA8ZmlsZT5dXG4iCi0JCQkJIiAgICAgICAlcyA8ZmlsZT4gW2FyZ3MuLi5dXG4iCi0JCQkJ IiAgLWEgICAgICAgICAgICAgICBSdW4gaW50ZXJhY3RpdmVseVxuIgotCQkJCSIgIC1iIDxhZGRy ZXNzOnBvcnQ+fDxwb3J0PiBCaW5kIFBhdGggZm9yIGV4dGVybmFsIEZBU1RDR0kgU2VydmVyIG1v ZGVcbiIKLQkJCQkiICAtQyAgICAgICAgICAgICAgIERvIG5vdCBjaGRpciB0byB0aGUgc2NyaXB0 J3MgZGlyZWN0b3J5XG4iCisJcGhwX3ByaW50ZigJIlVzYWdlOiAlcyBbLW5dIFstZV0gWy1oXSBb LWldIFstbV0gWy12XSBbLWMgPGZpbGU+XSBbLWQgZm9vWz1iYXJdXSBbLXkgPGZpbGU+XVxuIgog CQkJCSIgIC1jIDxwYXRoPnw8ZmlsZT4gTG9vayBmb3IgcGhwLmluaSBmaWxlIGluIHRoaXMgZGly ZWN0b3J5XG4iCiAJCQkJIiAgLW4gICAgICAgICAgICAgICBObyBwaHAuaW5pIGZpbGUgd2lsbCBi ZSB1c2VkXG4iCiAJCQkJIiAgLWQgZm9vWz1iYXJdICAgICBEZWZpbmUgSU5JIGVudHJ5IGZvbyB3 aXRoIHZhbHVlICdiYXInXG4iCiAJCQkJIiAgLWUgICAgICAgICAgICAgICBHZW5lcmF0ZSBleHRl bmRlZCBpbmZvcm1hdGlvbiBmb3IgZGVidWdnZXIvcHJvZmlsZXJcbiIKLQkJCQkiICAtZiA8Zmls ZT4gICAgICAgIFBhcnNlIDxmaWxlPi4gIEltcGxpZXMgYC1xJ1xuIgogCQkJCSIgIC1oICAgICAg ICAgICAgICAgVGhpcyBoZWxwXG4iCiAJCQkJIiAgLWkgICAgICAgICAgICAgICBQSFAgaW5mb3Jt YXRpb25cbiIKLQkJCQkiICAtbCAgICAgICAgICAgICAgIFN5bnRheCBjaGVjayBvbmx5IChsaW50 KVxuIgogCQkJCSIgIC1tICAgICAgICAgICAgICAgU2hvdyBjb21waWxlZCBpbiBtb2R1bGVzXG4i Ci0JCQkJIiAgLXEgICAgICAgICAgICAgICBRdWlldC1tb2RlLiAgU3VwcHJlc3MgSFRUUCBIZWFk ZXIgb3V0cHV0LlxuIgotCQkJCSIgIC1zICAgICAgICAgICAgICAgRGlzcGxheSBjb2xvdXIgc3lu dGF4IGhpZ2hsaWdodGVkIHNvdXJjZS5cbiIKIAkJCQkiICAtdiAgICAgICAgICAgICAgIFZlcnNp b24gbnVtYmVyXG4iCi0JCQkJIiAgLXcgICAgICAgICAgICAgICBEaXNwbGF5IHNvdXJjZSB3aXRo IHN0cmlwcGVkIGNvbW1lbnRzIGFuZCB3aGl0ZXNwYWNlLlxuIgogCQkJCSIgIC15LCAtLWZwbS1j b25maWcgPGZpbGU+XG4iCi0JCQkJIiAgICAgICAgICAgICAgICAgICBTcGVjaWZ5IGFsdGVybmF0 aXZlIHBhdGggdG8gRmFzdENHSSBwcm9jZXNzIG1hbmFnZXIgY29uZmlnIGZpbGUuXG4iCi0JCQkJ IiAgLXogPGZpbGU+ICAgICAgICBMb2FkIFplbmQgZXh0ZW5zaW9uIDxmaWxlPi5cbiIKLQkJCQki ICAtVCA8Y291bnQ+ICAgICAgIE1lYXN1cmUgZXhlY3V0aW9uIHRpbWUgb2Ygc2NyaXB0IHJlcGVh dGVkIDxjb3VudD4gdGltZXMuXG4iLAotCQkJCXByb2csIHByb2cpOworCQkJCSIgICAgICAgICAg ICAgICAgICAgU3BlY2lmeSBhbHRlcm5hdGl2ZSBwYXRoIHRvIEZhc3RDR0kgcHJvY2VzcyBtYW5h Z2VyIGNvbmZpZyBmaWxlLlxuIiwKKwkJCQlwcm9nKTsKIH0KIC8qIH19fSAqLwogCkBAIC0xNjYy LDYgKzE2NDEsNyBAQAogCQkJCWV4aXRfc3RhdHVzID0gMDsKIAkJCQlnb3RvIG91dDsKIAorCQkJ ZGVmYXVsdDoKIAkJCWNhc2UgJ2gnOgogCQkJY2FzZSAnPyc6CiAJCQkJY2dpX3NhcGlfbW9kdWxl LnN0YXJ0dXAoJmNnaV9zYXBpX21vZHVsZSk7CkBAIC0xNjkzLDYgKzE2NzMsMTkgQEAKIAkJCQln b3RvIG91dDsKIAkJfQogCX0KKworCS8qIE5vIG90aGVyIGFyZ3MgYXJlIHBlcm1pdHRlZCBoZXJl IGFzIHRoZXJlIGlzIG5vdCBpbnRlcmFjdGl2ZSBtb2RlICovCisJaWYgKGFyZ2MgIT0gcGhwX29w dGluZCkgeworCQljZ2lfc2FwaV9tb2R1bGUuc3RhcnR1cCgmY2dpX3NhcGlfbW9kdWxlKTsKKwkJ cGhwX291dHB1dF9zdGFydHVwKCk7CisJCXBocF9vdXRwdXRfYWN0aXZhdGUoVFNSTUxTX0MpOwor CQlTRyhoZWFkZXJzX3NlbnQpID0gMTsKKwkJcGhwX2NnaV91c2FnZShhcmd2WzBdKTsKKwkJcGhw X2VuZF9vYl9idWZmZXJzKDEgVFNSTUxTX0NDKTsKKwkJZXhpdF9zdGF0dXMgPSAwOworCQlnb3Rv IG91dDsKKwl9CisKIAlwaHBfb3B0aW5kID0gb3JpZ19vcHRpbmQ7CiAJcGhwX29wdGFyZyA9IG9y aWdfb3B0YXJnOwogCg== --0016e646926a48e198047ada0b25--