Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:46445 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 61625 invoked from network); 16 Dec 2009 15:33:57 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Dec 2009 15:33:57 -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:58655] helo=mail-iw0-f195.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 1D/3E-13001-5EDF82B4 for ; Wed, 16 Dec 2009 10:33:57 -0500 Received: by iwn33 with SMTP id 33so758316iwn.29 for ; Wed, 16 Dec 2009 07:33:55 -0800 (PST) MIME-Version: 1.0 Received: by 10.231.4.75 with SMTP id 11mr1141078ibq.25.1260977635068; Wed, 16 Dec 2009 07:33:55 -0800 (PST) Date: Wed, 16 Dec 2009 16:33:55 +0100 Message-ID: <3bea96c40912160733s20a6bb3bpab6919536ab86bc9@mail.gmail.com> To: php-dev Cc: Antony Dovgal Content-Type: multipart/mixed; boundary=0015177404c6020ca6047ada3ce9 Subject: [PATCH] bug: some event from parent might be triggered by children From: jerome@loyet.net (=?ISO-8859-1?B?Suly9G1lIExveWV0?=) --0015177404c6020ca6047ada3ce9 Content-Type: text/plain; charset=ISO-8859-1 hi tony, this patch correct a behaviour that could happened randomly, depending on the event lib used (epoll, poll, kqueue, ...). There is some case in which an event created by the parent process can be triggered in a child. This patch corrects this by checking if fpm_globals.is_child is set and return directly in this case. ++ Jerome --0015177404c6020ca6047ada3ce9 Content-Type: text/plain; name="php-fpm.no_event_if_child.patch.txt" Content-Disposition: attachment; filename="php-fpm.no_event_if_child.patch.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g3a9ig9c0 SW5kZXg6IHNhcGkvZnBtL2ZwbS9mcG1fcHJvY2Vzc19jdGwuYwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzYXBp L2ZwbS9mcG0vZnBtX3Byb2Nlc3NfY3RsLmMJKHLpdmlzaW9uIDI5MjIwNykKKysrIHNhcGkvZnBt L2ZwbS9mcG1fcHJvY2Vzc19jdGwuYwkoY29waWUgZGUgdHJhdmFpbCkKQEAgLTI5Niw2ICsyOTYs MTEgQEAKIHsKIAlzdHJ1Y3QgZnBtX3dvcmtlcl9wb29sX3MgKndwOwogCisJLyogSWYgaXQncyBj aGlsZCwgcmV0dXJuIGltbWVkaWF0ZWx5ICovCisJaWYgKGZwbV9nbG9iYWxzLmlzX2NoaWxkKSB7 CisJCXJldHVybjsKKwl9CisKIAlmb3IgKHdwID0gZnBtX3dvcmtlcl9hbGxfcG9vbHM7IHdwOyB3 cCA9IHdwLT5uZXh0KSB7CiAJCWludCB0ZXJtaW5hdGVfdGltZW91dCA9IHdwLT5jb25maWctPnJl cXVlc3RfdGVybWluYXRlX3RpbWVvdXQ7CiAJCWludCBzbG93bG9nX3RpbWVvdXQgPSB3cC0+Y29u ZmlnLT5yZXF1ZXN0X3Nsb3dsb2dfdGltZW91dDsKQEAgLTMxNiw2ICszMjEsMTEgQEAKIAlzdHJ1 Y3QgZnBtX2NoaWxkX3MgKmxhc3RfaWRsZV9jaGlsZCA9IE5VTEw7CiAJaW50IGk7CiAKKwkvKiBJ ZiBpdCdzIGNoaWxkLCByZXR1cm4gaW1tZWRpYXRlbHkgKi8KKwlpZiAoZnBtX2dsb2JhbHMuaXNf Y2hpbGQpIHsKKwkJcmV0dXJuOworCX0KKwogCWZvciAod3AgPSBmcG1fd29ya2VyX2FsbF9wb29s czsgd3A7IHdwID0gd3AtPm5leHQpIHsKIAkJc3RydWN0IGZwbV9jaGlsZF9zICpjaGlsZDsKIAkJ aW50IGlkbGUgPSAwOwpAQCAtMzk4LDYgKzQwOCwxMSBAQAogCXN0cnVjdCB0aW1ldmFsIHR2ID0g eyAudHZfc2VjID0gMCwgLnR2X3VzZWMgPSAxMzAwMDAgfTsKIAlzdHJ1Y3QgdGltZXZhbCBub3c7 CiAKKwkvKiBJZiBpdCdzIGNoaWxkLCByZXR1cm4gaW1tZWRpYXRlbHkgKi8KKwlpZiAoZnBtX2ds b2JhbHMuaXNfY2hpbGQpIHsKKwkJcmV0dXJuOworCX0KKwogCWlmICh3aGljaCA9PSBFVl9USU1F T1VUKSB7CiAJCWV2dGltZXJfZGVsKCZoZWFydGJlYXQpOwogCQlmcG1fY2xvY2tfZ2V0KCZub3cp OwpAQCAtNDE1LDYgKzQzMCwxMSBAQAogCXN0cnVjdCB0aW1ldmFsIHR2ID0geyAudHZfc2VjID0g MCwgLnR2X3VzZWMgPSBGUE1fSURMRV9TRVJWRVJfTUFJTlRFTkFOQ0VfSEVBUlRCRUFUIH07CiAJ c3RydWN0IHRpbWV2YWwgbm93OwogCisJLyogSWYgaXQncyBjaGlsZCwgcmV0dXJuIGltbWVkaWF0 ZWx5ICovCisJaWYgKGZwbV9nbG9iYWxzLmlzX2NoaWxkKSB7CisJCXJldHVybjsKKwl9CisKIAlp ZiAod2hpY2ggPT0gRVZfVElNRU9VVCkgewogCQlldnRpbWVyX2RlbCgmaGVhcnRiZWF0KTsKIAkJ ZnBtX2Nsb2NrX2dldCgmbm93KTsKSW5kZXg6IHNhcGkvZnBtL2ZwbS9mcG1fc3RkaW8uYwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBzYXBpL2ZwbS9mcG0vZnBtX3N0ZGlvLmMJKHLpdmlzaW9uIDI5MjIwNykKKysr IHNhcGkvZnBtL2ZwbS9mcG1fc3RkaW8uYwkoY29waWUgZGUgdHJhdmFpbCkKQEAgLTg0LDYgKzg0 LDExIEBACiAJaW50IGluX2J1ZiA9IDA7CiAJaW50IHJlczsKIAorCS8qIElmIGl0J3MgY2hpbGQs IHJldHVybiBpbW1lZGlhdGVseSAqLworCWlmIChmcG1fZ2xvYmFscy5pc19jaGlsZCkgeworCQly ZXR1cm47CisJfQorCiAjaWYgMAogCXpsb2coWkxPR19TVFVGRiwgWkxPR19ERUJVRywgImNoaWxk ICVkIHNhaWQgJXMiLCAoaW50KSBjaGlsZC0+cGlkLCBpc19zdGRvdXQgPyAic3Rkb3V0IiA6ICJz dGRlcnIiKTsKICNlbmRpZgo= --0015177404c6020ca6047ada3ce9--