Return-Path: X-Original-To: apmail-httpd-dev-archive@www.apache.org Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EB731D3E6 for ; Thu, 9 Aug 2012 18:14:58 +0000 (UTC) Received: (qmail 48458 invoked by uid 500); 9 Aug 2012 18:14:58 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 48381 invoked by uid 500); 9 Aug 2012 18:14:57 -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: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 48373 invoked by uid 99); 9 Aug 2012 18:14:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 18:14:57 +0000 X-ASF-Spam-Status: No, hits=2.2 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS,UNRESOLVED_TEMPLATE X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of claudioc@microsoft.com designates 216.32.180.31 as permitted sender) Received: from [216.32.180.31] (HELO va3outboundpool.messaging.microsoft.com) (216.32.180.31) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 18:14:46 +0000 Received: from mail146-va3-R.bigfish.com (10.7.14.253) by VA3EHSOBE008.bigfish.com (10.7.40.28) with Microsoft SMTP Server id 14.1.225.23; Thu, 9 Aug 2012 18:14:24 +0000 Received: from mail146-va3 (localhost [127.0.0.1]) by mail146-va3-R.bigfish.com (Postfix) with ESMTP id 5E6BA2C0220 for ; Thu, 9 Aug 2012 18:14:24 +0000 (UTC) X-Forefront-Antispam-Report: CIP:131.107.125.8;KIP:(null);UIP:(null);IPV:NLI;H:TK5EX14HUBC102.redmond.corp.microsoft.com;RD:none;EFVD:NLI X-SpamScore: -3 X-BigFish: VS-3(zzc85fh13fcMzz1202hzz8275bh8275dhz2fh2a8h683h839hd24hf0ah107ah9a9j34h) Received-SPF: pass (mail146-va3: domain of microsoft.com designates 131.107.125.8 as permitted sender) client-ip=131.107.125.8; envelope-from=claudioc@microsoft.com; helo=TK5EX14HUBC102.redmond.corp.microsoft.com ;icrosoft.com ; X-Forefront-Antispam-Report-Untrusted: CIP:157.56.240.21;KIP:(null);UIP:(null);(null);H:BL2PRD0310HT002.namprd03.prod.outlook.com;R:internal;EFV:INT Received: from mail146-va3 (localhost.localdomain [127.0.0.1]) by mail146-va3 (MessageSwitch) id 1344536062514509_14975; Thu, 9 Aug 2012 18:14:22 +0000 (UTC) Received: from VA3EHSMHS030.bigfish.com (unknown [10.7.14.245]) by mail146-va3.bigfish.com (Postfix) with ESMTP id 70A63480226 for ; Thu, 9 Aug 2012 18:14:22 +0000 (UTC) Received: from TK5EX14HUBC102.redmond.corp.microsoft.com (131.107.125.8) by VA3EHSMHS030.bigfish.com (10.7.99.40) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 9 Aug 2012 18:14:19 +0000 Received: from co1outboundpool.messaging.microsoft.com (157.54.51.114) by mail.microsoft.com (157.54.7.154) with Microsoft SMTP Server (TLS) id 14.2.309.3; Thu, 9 Aug 2012 18:13:57 +0000 Received: from mail52-co1-R.bigfish.com (10.243.78.236) by CO1EHSOBE014.bigfish.com (10.243.66.77) with Microsoft SMTP Server id 14.1.225.23; Thu, 9 Aug 2012 18:13:24 +0000 Received: from mail52-co1 (localhost [127.0.0.1]) by mail52-co1-R.bigfish.com (Postfix) with ESMTP id D4956D800BD for ; Thu, 9 Aug 2012 18:13:24 +0000 (UTC) X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(51164001)(16406001)(5343655001)(5343635001)(42186003)(33646001)(31966006)(24736002);DIR:INB;;LANG:en; Received: from mail52-co1 (localhost.localdomain [127.0.0.1]) by mail52-co1 (MessageSwitch) id 1344536002950110_23131; Thu, 9 Aug 2012 18:13:22 +0000 (UTC) Received: from CO1EHSMHS011.bigfish.com (unknown [10.243.78.235]) by mail52-co1.bigfish.com (Postfix) with ESMTP id E597E90024D for ; Thu, 9 Aug 2012 18:13:22 +0000 (UTC) Received: from BL2PRD0310HT002.namprd03.prod.outlook.com (157.56.240.21) by CO1EHSMHS011.bigfish.com (10.243.66.21) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 9 Aug 2012 18:13:22 +0000 Received: from BY2PR03MB607.namprd03.prod.outlook.com (10.255.93.38) by BL2PRD0310HT002.namprd03.prod.outlook.com (10.255.97.37) with Microsoft SMTP Server (TLS) id 14.16.175.8; Thu, 9 Aug 2012 18:13:21 +0000 Received: from BY2PR03MB608.namprd03.prod.outlook.com (10.255.93.39) by BY2PR03MB607.namprd03.prod.outlook.com (10.255.93.38) with Microsoft SMTP Server (TLS) id 15.0.466.11; Thu, 9 Aug 2012 18:13:19 +0000 Received: from BY2PR03MB608.namprd03.prod.outlook.com ([169.254.7.250]) by BY2PR03MB608.namprd03.prod.outlook.com ([169.254.7.250]) with mapi id 15.00.0485.006; Thu, 9 Aug 2012 18:13:19 +0000 From: "Claudio Caldato (MS OPEN TECH)" To: "dev@httpd.apache.org" Subject: Fix for Windows bug#52476 Thread-Topic: Fix for Windows bug#52476 Thread-Index: Ac12WnbT4Ifglnp2TBmHgT9blnesqw== Date: Thu, 9 Aug 2012 18:13:18 +0000 Message-ID: <31f247cbaff240b7a06a2c3713fb8a96@BY2PR03MB608.namprd03.prod.outlook.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.255.156.150] x-forefront-prvs: 0568F32D91 Content-Type: multipart/mixed; boundary="_004_31f247cbaff240b7a06a2c3713fb8a96BY2PR03MB608namprd03pro_" MIME-Version: 1.0 X-OrganizationHeadersPreserved: BY2PR03MB607.namprd03.prod.outlook.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-FOPE-CONNECTOR: Id%59$Dn%HTTPD.APACHE.ORG$RO%2$TLS%6$FQDN%131.107.125.5$TlsDn% X-CrossPremisesHeadersPromoted: TK5EX14HUBC102.redmond.corp.microsoft.com X-CrossPremisesHeadersFiltered: TK5EX14HUBC102.redmond.corp.microsoft.com X-OriginatorOrg: microsoft.com --_004_31f247cbaff240b7a06a2c3713fb8a96BY2PR03MB608namprd03pro_ Content-Type: multipart/alternative; boundary="_000_31f247cbaff240b7a06a2c3713fb8a96BY2PR03MB608namprd03pro_" --_000_31f247cbaff240b7a06a2c3713fb8a96BY2PR03MB608namprd03pro_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Please code review the fix and let me know if you find any issue. Attached is the proposed patch for server\mpm\winnt\child.c Summary for code reviewers: If AcceptFilter is 'connect' or 'none', we read data from socket on worker = thread. We use blocking recv and assign context->overlapped.Pointer to heap= allocated buffer. It is the same procedure as in case of 'AcceptFilter dat= a', but done in worker thread to keep listen thread unblocked. Note: It looks like context with overlapped.Pointer =3D=3D NULL is not processed = correctly in windows version of httpd. It may be related to the fact that w= innt_insert_network_bucket() rejects context records with overlapped.Pointe= r =3D=3D NULL Please advise on what the next step(s) should be. Thanks Claudio --_000_31f247cbaff240b7a06a2c3713fb8a96BY2PR03MB608namprd03pro_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Please code review the= fix and let me know if you find any issue.

 

Attached is the propos= ed patch for

server\mpm\winnt\child= .c

 

Summary for code revie= wers:

If AcceptFilter is ‘connect’ or ‘none’, we = read data from socket on worker thread. We use blocking recv and assign con= text->overlapped.Pointer to heap allocated buffer. It is the same procedure as in case of ‘AcceptFilter data’, but done in worke= r thread to keep listen thread unblocked.

 

Note:

It looks like context = with overlapped.Pointer =3D=3D NULL is not processed correctly in windows v= ersion of httpd. It may be related to the fact that winnt_insert_ne= twork_bucket() rejects context records with overlappe= d.Pointer =3D=3D NULL

 

 

Please advise on what = the next step(s) should be.

 

Thanks

Claudio

 

--_000_31f247cbaff240b7a06a2c3713fb8a96BY2PR03MB608namprd03pro_-- --_004_31f247cbaff240b7a06a2c3713fb8a96BY2PR03MB608namprd03pro_ Content-Type: application/octet-stream; name="child.c.patch" Content-Description: child.c.patch Content-Disposition: attachment; filename="child.c.patch"; size=1527; creation-date="Thu, 09 Aug 2012 18:09:17 GMT"; modification-date="Thu, 09 Aug 2012 18:09:17 GMT" Content-Transfer-Encoding: base64 SW5kZXg6IGNoaWxkLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBjaGlsZC5jCShyZXZpc2lvbiAxMzcxMzI0 KQ0KKysrIGNoaWxkLmMJKHdvcmtpbmcgY29weSkNCkBAIC0yOTQsNyArMjk0LDcgQEANCiAgICAg YXBfbGlzdGVuX3JlYyAqbHIgPSAoYXBfbGlzdGVuX3JlYyAqKWxyXzsKICAgICBhcHJfb3Nfc29j a19pbmZvX3Qgc29ja2luZm87CiAgICAgd2lubnRfY29ubl9jdHhfdCAqY29udGV4dCA9IE5VTEw7 Ci0gICAgRFdPUkQgQnl0ZXNSZWFkOworICAgIERXT1JEIEJ5dGVzUmVhZCA9IDA7CiAgICAgU09D S0VUIG5sc2Q7CiAgICAgTFBGTl9BQ0NFUFRFWCBscGZuQWNjZXB0RXggPSBOVUxMOwogICAgIExQ Rk5fR0VUQUNDRVBURVhTT0NLQUREUlMgbHBmbkdldEFjY2VwdEV4U29ja2FkZHJzID0gTlVMTDsK QEAgLTgzMiw2ICs4MzIsMjggQEANCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAorICAgICAg ICAvKiAgQWNjZXB0RmlsdGVyIGNvbm5lY3R8bm9uZSBkbyBub3QgcmVhZCBkYXRhLiBSZWFkIGl0 IGhlcmUuICAqLworICAgICAgICBpZiAoKGNvbnRleHQtPm92ZXJsYXBwZWQuUG9pbnRlciA9PSBO VUxMKSAmJiAoY29udGV4dC0+YWNjZXB0X3NvY2tldCAhPSBJTlZBTElEX1NPQ0tFVCkpCisgICAg ICAgIHsKKyAgICAgICAgICAgIGFwcl9idWNrZXQgKmI7CisgICAgICAgICAgICBjaGFyICpidWZm ZXI7CisKKyAgICAgICAgICAgIGJ1ZmZlciA9IGFwcl9idWNrZXRfYWxsb2MoQVBSX0JVQ0tFVF9C VUZGX1NJWkUsIGNvbnRleHQtPmJhKTsKKyAgICAgICAgICAgIHJjID0gcmVjdihjb250ZXh0LT5h Y2NlcHRfc29ja2V0LCBidWZmZXIsIEFQUl9CVUNLRVRfQlVGRl9TSVpFLCAwKTsKKyAgICAgICAg ICAgIGlmIChyYyA9PSBTT0NLRVRfRVJST1IpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgYXBfbG9nX2Vycm9yKEFQTE9HX01BUkssIEFQTE9HX0VSUiwgcmMsIGFwX3NlcnZlcl9jb25m LCBBUExPR05PKDAwMzY1KQorICAgICAgICAgICAgICAgICAgICAgICAgIndvcmtlcl9tYWluOiBy ZWN2IGVycm9yIik7CisgICAgICAgICAgICAgICAgYXByX2J1Y2tldF9mcmVlKGJ1ZmZlcik7Cisg ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGIg PSBhcHJfYnVja2V0X2hlYXBfY3JlYXRlKGJ1ZmZlciwgQVBSX0JVQ0tFVF9CVUZGX1NJWkUsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXByX2J1Y2tldF9mcmVl LCBjb250ZXh0LT5iYSk7CisgICAgICAgICAgICBiLT5sZW5ndGggPSByYzsKKyAgICAgICAgICAg IGNvbnRleHQtPm92ZXJsYXBwZWQuUG9pbnRlciA9IGI7CisgICAgICAgIH0KKwogICAgICAgICBl ID0gY29udGV4dC0+b3ZlcmxhcHBlZC5Qb2ludGVyOwogCiAgICAgICAgIGFwX2NyZWF0ZV9zYl9o YW5kbGUoJnNiaCwgY29udGV4dC0+cHRyYW5zLCAwLCB0aHJlYWRfbnVtKTsK --_004_31f247cbaff240b7a06a2c3713fb8a96BY2PR03MB608namprd03pro_--