Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:67441 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 44096 invoked from network); 17 May 2013 16:44:11 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 17 May 2013 16:44:11 -0000 Authentication-Results: pb1.pair.com smtp.mail=remi@fedoraproject.org; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=remi@fedoraproject.org; sender-id=unknown Received-SPF: error (pb1.pair.com: domain fedoraproject.org from 212.27.42.5 cause and error) X-PHP-List-Original-Sender: remi@fedoraproject.org X-Host-Fingerprint: 212.27.42.5 smtp5-g21.free.fr Linux 2.6 Received: from [212.27.42.5] ([212.27.42.5:42798] helo=smtp5-g21.free.fr) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 8F/C6-05661-85E56915 for ; Fri, 17 May 2013 12:44:09 -0400 Received: from dixsept.famillecollet.com (unknown [82.241.130.121]) by smtp5-g21.free.fr (Postfix) with ESMTP id 6940BD48142 for ; Fri, 17 May 2013 18:44:02 +0200 (CEST) Message-ID: <51965E51.80004@fedoraproject.org> Date: Fri, 17 May 2013 18:44:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130515 Thunderbird/17.0.6 MIME-Version: 1.0 To: internals@lists.php.net X-Enigmail-Version: 1.5.1 Content-Type: multipart/mixed; boundary="------------030306010103010609050002" Subject: php-fpm and systemd integration From: remi@fedoraproject.org (Remi Collet) --------------030306010103010609050002 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, I plan to allow php-fpm to be aware of systemd and so, use the type=notify mode. I'd like to apply to attached patch to 5.4 and 5.5, as this change have no impact on standard build (need new --with-fpm-systemd build option). Any feedback before I process ? Remi. --------------030306010103010609050002 Content-Type: text/plain; charset=UTF-8; name="patch.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch.txt" ZGlmZiAtdXAgLi4vc2FwaS9mcG0vY29uZmlnLm00LnN5c3RlbWQgLi4vc2FwaS9mcG0vY29u ZmlnLm00Ci0tLSAuLi9zYXBpL2ZwbS9jb25maWcubTQuc3lzdGVtZAkyMDEzLTA1LTA4IDE4 OjQ1OjMxLjAwMDAwMDAwMCArMDIwMAorKysgLi4vc2FwaS9mcG0vY29uZmlnLm00CTIwMTMt MDUtMTcgMTI6MjA6MTkuMTk5ODQxMzA0ICswMjAwCkBAIC01NjMsNiArNTYzLDI2IEBAIGlm IHRlc3QgIiRQSFBfRlBNIiAhPSAibm8iOyB0aGVuCiAgIFsgIC0td2l0aC1mcG0tZ3JvdXBb PUdSUF0gIFNldCB0aGUgZ3JvdXAgZm9yIHBocC1mcG0gdG8gcnVuIGFzLiBGb3IgYSBzeXN0 ZW0gdXNlciwgdGhpcyAKICAgICAgICAgICAgICAgICAgIHNob3VsZCB1c3VhbGx5IGJlIHNl dCB0byBtYXRjaCB0aGUgZnBtIHVzZXJuYW1lIChkZWZhdWx0OiBub2JvZHkpXSwgbm9ib2R5 LCBubykKIAorICBQSFBfQVJHX1dJVEgoZnBtLXN5c3RlbWQsLAorICBbICAtLXdpdGgtZnBt LXN5c3RlbWQgICAgICBBY3RpdmF0ZSBzeXN0ZW1kIGludGVncmF0aW9uXSwgbm8sIG5vKQor CisgIGlmIHRlc3QgIiRQSFBfRlBNX1NZU1RFTUQiICE9ICJubyIgOyB0aGVuCisgICAgQUNf Q0hFQ0tfTElCKHN5c3RlbWQtZGFlbW9uLCBzZF9ub3RpZnksIFNZU1RFTURfTElCUz0iLWxz eXN0ZW1kLWRhZW1vbiIpCisgICAgQUNfQ0hFQ0tfSEVBREVSUyhzeXN0ZW1kL3NkLWRhZW1v bi5oLCBbSEFWRV9TRF9EQUVNT05fSD0ieWVzIl0sIFtIQVZFX1NEX0RBRU1PTl9IPSJubyJd KQorICAgIGlmIHRlc3QgJEhBVkVfU0RfREFFTU9OX0ggPSAibm8iIHx8IHRlc3QgLXogIiR7 U1lTVEVNRF9MSUJTfSI7IHRoZW4KKyAgICAgIEFDX01TR19FUlJPUihbWW91ciBzeXN0ZW0g ZG9lcyBub3Qgc3VwcG9ydCBzeXN0ZW1kLl0pCisgICAgZWxzZQorICAgICAgQUNfREVGSU5F KEhBVkVfU1lTVEVNRCwgMSwgW0ZQTSB1c2Ugc3lzdGVtZCBpbnRlZ3JhdGlvbl0pCisgICAg ICBQSFBfRlBNX1NEX0ZJTEVTPSJmcG0vZnBtX3N5c3RlbWQuYyIKKyAgICAgIFBIUF9BRERf TElCUkFSWShzeXN0ZW1kLWRhZW1vbikKKyAgICAgIHBocF9mcG1fc3lzdGVtZD1ub3RpZnkK KyAgICBmaQorICBlbHNlCisgICAgcGhwX2ZwbV9zeXN0ZW1kPXNpbXBsZQorICBmaQorICBQ SFBfU1VCU1RfT0xEKHBocF9mcG1fc3lzdGVtZCkKKyAgQUNfREVGSU5FX1VOUVVPVEVEKFBI UF9GUE1fU1lTVEVNRCwgIiRwaHBfZnBtX3N5c3RlbWQiLCBbZnBtIHN5c3RlbWQgc2Vydmlj ZSB0eXBlXSkKKwogICBpZiB0ZXN0IC16ICIkUEhQX0ZQTV9VU0VSIiAtbyAiJFBIUF9GUE1f VVNFUiIgPSAieWVzIiAtbyAiJFBIUF9GUE1fVVNFUiIgPSAibm8iOyB0aGVuCiAgICAgcGhw X2ZwbV91c2VyPSJub2JvZHkiCiAgIGVsc2UKQEAgLTYzMSw3ICs2NTEsNyBAQCBpZiB0ZXN0 ICIkUEhQX0ZQTSIgIT0gIm5vIjsgdGhlbgogCQlmcG0vZXZlbnRzL3BvcnQuYyBcCiAgICIK IAotICBQSFBfU0VMRUNUX1NBUEkoZnBtLCBwcm9ncmFtLCAkUEhQX0ZQTV9GSUxFUyAkUEhQ X0ZQTV9UUkFDRV9GSUxFUywgJFBIUF9GUE1fQ0ZMQUdTLCAnJChTQVBJX0ZQTV9QQVRIKScp CisgIFBIUF9TRUxFQ1RfU0FQSShmcG0sIHByb2dyYW0sICRQSFBfRlBNX0ZJTEVTICRQSFBf RlBNX1RSQUNFX0ZJTEVTICRQSFBfRlBNX1NEX0ZJTEVTLCAkUEhQX0ZQTV9DRkxBR1MsICck KFNBUElfRlBNX1BBVEgpJykKIAogICBjYXNlICRob3N0X2FsaWFzIGluCiAgICAgICAqYWl4 KikKZGlmZiAtdXAgLi4vc2FwaS9mcG0vZnBtL2ZwbV9ldmVudHMuYy5zeXN0ZW1kIC4uL3Nh cGkvZnBtL2ZwbS9mcG1fZXZlbnRzLmMKLS0tIC4uL3NhcGkvZnBtL2ZwbS9mcG1fZXZlbnRz LmMuc3lzdGVtZAkyMDEzLTA1LTA4IDE4OjQ1OjMxLjAwMDAwMDAwMCArMDIwMAorKysgLi4v c2FwaS9mcG0vZnBtL2ZwbV9ldmVudHMuYwkyMDEzLTA1LTE3IDEzOjEzOjEwLjg1NDg5Njgy MCArMDIwMApAQCAtMjksNiArMjksMTAgQEAKICNpbmNsdWRlICJldmVudHMvcG9ydC5oIgog I2luY2x1ZGUgImV2ZW50cy9rcXVldWUuaCIKIAorI2lmZGVmIEhBVkVfU1lTVEVNRAorI2lu Y2x1ZGUgImZwbV9zeXN0ZW1kLmgiCisjZW5kaWYKKwogI2RlZmluZSBmcG1fZXZlbnRfc2V0 X3RpbWVvdXQoZXYsIG5vdykgdGltZXJhZGQoJihub3cpLCAmKGV2KS0+ZnJlcXVlbmN5LCAm KGV2KS0+dGltZW91dCk7CiAKIHN0YXRpYyB2b2lkIGZwbV9ldmVudF9jbGVhbnVwKGludCB3 aGljaCwgdm9pZCAqYXJnKTsKQEAgLTM2MSw2ICszNjUsMTAgQEAgdm9pZCBmcG1fZXZlbnRf bG9vcChpbnQgZXJyKSAvKiB7e3sgKi8KIAogCQl6bG9nKFpMT0dfREVCVUcsICIlenUgYnl0 ZXMgaGF2ZSBiZWVuIHJlc2VydmVkIGluIFNITSIsIGZwbV9zaG1fZ2V0X3NpemVfYWxsb2Nh dGVkKCkpOwogCQl6bG9nKFpMT0dfTk9USUNFLCAicmVhZHkgdG8gaGFuZGxlIGNvbm5lY3Rp b25zIik7CisKKyNpZmRlZiBIQVZFX1NZU1RFTUQKKwkJZnBtX3N5c3RlbWRfaGVhcnRiZWF0 KE5VTEwsIDAsIE5VTEwpOworI2VuZGlmCiAJfQogCiAJd2hpbGUgKDEpIHsKZGlmZiAtdXAg Li4vc2FwaS9mcG0vZnBtL2ZwbV9zeXN0ZW1kLmMuc3lzdGVtZCAuLi9zYXBpL2ZwbS9mcG0v ZnBtX3N5c3RlbWQuYwotLS0gLi4vc2FwaS9mcG0vZnBtL2ZwbV9zeXN0ZW1kLmMuc3lzdGVt ZAkyMDEzLTA1LTE3IDEyOjIwOjE5LjIwMDg0MTMwOSArMDIwMAorKysgLi4vc2FwaS9mcG0v ZnBtL2ZwbV9zeXN0ZW1kLmMJMjAxMy0wNS0xNyAxNDoxODozNi44NTEwNzkyMDggKzAyMDAK QEAgLTAsMCArMSw3NCBAQAorI2luY2x1ZGUgImZwbV9jb25maWcuaCIKKworI2luY2x1ZGUg PHN5cy90eXBlcy5oPgorI2luY2x1ZGUgPHN5c3RlbWQvc2QtZGFlbW9uLmg+CisKKyNpbmNs dWRlICJmcG0uaCIKKyNpbmNsdWRlICJmcG1fY2xvY2suaCIKKyNpbmNsdWRlICJmcG1fd29y a2VyX3Bvb2wuaCIKKyNpbmNsdWRlICJmcG1fc2NvcmVib2FyZC5oIgorI2luY2x1ZGUgInps b2cuaCIKKyNpbmNsdWRlICJmcG1fc3lzdGVtZC5oIgorCisKK3N0YXRpYyB2b2lkIGZwbV9z eXN0ZW1kKCkgLyoge3t7ICovCit7CisJc3RhdGljIHVuc2lnbmVkIGxvbmcgaW50IGxhc3Q9 MDsKKwlzdHJ1Y3QgZnBtX3dvcmtlcl9wb29sX3MgKndwOworCXVuc2lnbmVkIGxvbmcgaW50 IHJlcXVlc3RzPTAsIHNsb3dfcmVxPTA7CisJaW50IGFjdGl2ZT0wLCBpZGxlPTAsIHJ2Owor CisKKwlmb3IgKHdwID0gZnBtX3dvcmtlcl9hbGxfcG9vbHM7IHdwOyB3cCA9IHdwLT5uZXh0 KSB7CisJCWlmICh3cC0+c2NvcmVib2FyZCkgeworCQkJYWN0aXZlICAgKz0gd3AtPnNjb3Jl Ym9hcmQtPmFjdGl2ZTsKKwkJCWlkbGUgICAgICs9IHdwLT5zY29yZWJvYXJkLT5pZGxlOwor CQkJcmVxdWVzdHMgKz0gd3AtPnNjb3JlYm9hcmQtPnJlcXVlc3RzOworCQkJc2xvd19yZXEg Kz0gd3AtPnNjb3JlYm9hcmQtPnNsb3dfcnE7CisJCX0KKwl9CisvKgorCXpsb2coWkxPR19E RUJVRywgInN5c3RlbWQgaGVhcnRiZWF0IChQcm9jZXNzZXMgYWN0aXZlOiVkLCBpZGxlOiVk LCBSZXF1ZXN0czolbHUsIHNsb3c6JWx1LCBUcmFmZmljOiUuM2dyZXEvc2VjKSIsIAorCQkJ YWN0aXZlLCBpZGxlLCByZXF1ZXN0cywgc2xvd19yZXEsICgoZmxvYXQpcmVxdWVzdHMgLSBs YXN0KSAqIDEwMDAuMCAvIEZQTV9TWVNURU1EX0hFQVJUQkVBVCk7CisqLworCXJ2ID0gc2Rf bm90aWZ5ZigwLCAiUkVBRFk9MVxuIgorCQkJCSJTVEFUVVM9UHJvY2Vzc2VzIGFjdGl2ZTog JWQsIGlkbGU6ICVkLCBSZXF1ZXN0czogJWx1LCBzbG93OiAlbHUsIFRyYWZmaWM6ICUuM2dy ZXEvc2VjIiwKKwkJCQlhY3RpdmUsIGlkbGUsIHJlcXVlc3RzLCBzbG93X3JlcSwgKChmbG9h dClyZXF1ZXN0cyAtIGxhc3QpICogMTAwMC4wIC8gRlBNX1NZU1RFTURfSEVBUlRCRUFUKTsK KworCWlmIChydiA8IDApIHsKKwkJemxvZyhaTE9HX05PVElDRSwgImZhaWxlZCB0byBub3Rp Znkgc3lzdGVtZCIpOworCX0KKworCWxhc3QgPSByZXF1ZXN0czsKK30KKy8qIH19fSAqLwor Cit2b2lkIGZwbV9zeXN0ZW1kX2hlYXJ0YmVhdChzdHJ1Y3QgZnBtX2V2ZW50X3MgKmV2LCBz aG9ydCB3aGljaCwgdm9pZCAqYXJnKSAvKiB7e3sgKi8KK3sKKwlzdGF0aWMgc3RydWN0IGZw bV9ldmVudF9zIGhlYXJ0YmVhdDsKKworCWlmIChmcG1fZ2xvYmFscy5wYXJlbnRfcGlkICE9 IGdldHBpZCgpKSB7CisJCXJldHVybjsgLyogc2FuaXR5IGNoZWNrICovCisJfQorCisJaWYg KHdoaWNoID09IEZQTV9FVl9USU1FT1VUKSB7CisJCWZwbV9zeXN0ZW1kKCk7CisKKwkJcmV0 dXJuOworCX0KKworCWlmIChzZF9ub3RpZnlmKDAsICJSRUFEWT0xXG4iCisJCQkgICAgICAg ICAgIlNUQVRVUz1yZWFkeSB0byBoYW5kbGUgY29ubmVjdGlvbnNcbiIKKwkJCSAgICAgICAg ICAiTUFJTlBJRD0lbHUiLAorCQkJICAgICAgICAgICh1bnNpZ25lZCBsb25nKSBnZXRwaWQo KSkgPCAwKSB7CisJCXpsb2coWkxPR19XQVJOSU5HLCAiZmFpbGVkIHRvIG5vdGlmeSBzeXN0 ZW1kIik7CisJfSBlbHNlIHsKKwkJemxvZyhaTE9HX0RFQlVHLCAiaGF2ZSBub3RpZnkgc3lz dGVtZCIpOworCX0KKworCS8qIGZpcnN0IGNhbGwgd2l0aG91dCBzZXR0aW5nIHdoaWNoIHRv IGluaXRpYWxpemUgdGhlIHRpbWVyICovCisJZnBtX2V2ZW50X3NldF90aW1lcigmaGVhcnRi ZWF0LCBGUE1fRVZfUEVSU0lTVCwgJmZwbV9zeXN0ZW1kX2hlYXJ0YmVhdCwgTlVMTCk7CisJ ZnBtX2V2ZW50X2FkZCgmaGVhcnRiZWF0LCBGUE1fU1lTVEVNRF9IRUFSVEJFQVQpOworfQor LyogfX19ICovCQorCmRpZmYgLXVwIC4uL3NhcGkvZnBtL2ZwbS9mcG1fc3lzdGVtZC5oLnN5 c3RlbWQgLi4vc2FwaS9mcG0vZnBtL2ZwbV9zeXN0ZW1kLmgKLS0tIC4uL3NhcGkvZnBtL2Zw bS9mcG1fc3lzdGVtZC5oLnN5c3RlbWQJMjAxMy0wNS0xNyAxMjoyMDoxOS4yMDA4NDEzMDkg KzAyMDAKKysrIC4uL3NhcGkvZnBtL2ZwbS9mcG1fc3lzdGVtZC5oCTIwMTMtMDUtMTcgMTQ6 MDI6MzcuNDAwMjQ3Nzk5ICswMjAwCkBAIC0wLDAgKzEsMTIgQEAKKyNpZm5kZWYgRlBNX1NZ U1RFTURfSAorI2RlZmluZSBGUE1fU1lTVEVNRF9IIDEKKworI2luY2x1ZGUgImZwbV9ldmVu dHMuaCIKKworLyogMTBzIChpbiBtcykgaGVhcnRiZWF0IGZvciBzeXN0ZW1kIHN0YXR1cyAq LworI2RlZmluZSBGUE1fU1lTVEVNRF9IRUFSVEJFQVQgKDEwMDAwKQorCit2b2lkIGZwbV9z eXN0ZW1kX2hlYXJ0YmVhdChzdHJ1Y3QgZnBtX2V2ZW50X3MgKmV2LCBzaG9ydCB3aGljaCwg dm9pZCAqYXJnKTsKKworI2VuZGlmCisKZGlmZiAtdXAgLi4vc2FwaS9mcG0vcGhwLWZwbS5z ZXJ2aWNlLmluLnN5c3RlbWQgLi4vc2FwaS9mcG0vcGhwLWZwbS5zZXJ2aWNlLmluCi0tLSAu Li9zYXBpL2ZwbS9waHAtZnBtLnNlcnZpY2UuaW4uc3lzdGVtZAkyMDEzLTA1LTA4IDE4OjQ1 OjMxLjAwMDAwMDAwMCArMDIwMAorKysgLi4vc2FwaS9mcG0vcGhwLWZwbS5zZXJ2aWNlLmlu CTIwMTMtMDUtMTcgMTI6MjA6MTkuMjAxODQxMzE0ICswMjAwCkBAIC0zLDYgKzMsNyBAQCBE ZXNjcmlwdGlvbj1UaGUgUEhQIEZhc3RDR0kgUHJvY2VzcyBNYW5hCiBBZnRlcj1zeXNsb2cu dGFyZ2V0IG5ldHdvcmsudGFyZ2V0CiAKIFtTZXJ2aWNlXQorVHlwZT1AcGhwX2ZwbV9zeXN0 ZW1kQAogUElERmlsZT1AbG9jYWxzdGF0ZWRpckAvcnVuL3BocC1mcG0ucGlkCiBFeGVjU3Rh cnQ9QHNiaW5kaXJAL3BocC1mcG0gLS1ub2RhZW1vbml6ZSAtLWZwbS1jb25maWcgQHN5c2Nv bmZkaXJAL3BocC1mcG0uY29uZgogRXhlY1JlbG9hZD0vYmluL2tpbGwgLVVTUjIgJE1BSU5Q SUQK --------------030306010103010609050002--