Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:89828 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 96413 invoked from network); 17 Dec 2015 06:21:59 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 17 Dec 2015 06:21:59 -0000 Authentication-Results: pb1.pair.com header.from=remi@fedoraproject.org; sender-id=unknown Authentication-Results: pb1.pair.com smtp.mail=remi@fedoraproject.org; spf=permerror; sender-id=unknown Received-SPF: error (pb1.pair.com: domain fedoraproject.org from 217.70.183.195 cause and error) X-PHP-List-Original-Sender: remi@fedoraproject.org X-Host-Fingerprint: 217.70.183.195 relay3-d.mail.gandi.net Received: from [217.70.183.195] ([217.70.183.195:52730] helo=relay3-d.mail.gandi.net) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id F2/AE-51216-38452765 for ; Thu, 17 Dec 2015 01:21:57 -0500 Received: from mfilter16-d.gandi.net (mfilter16-d.gandi.net [217.70.178.144]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 1F141A80D7; Thu, 17 Dec 2015 07:21:52 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter16-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter16-d.gandi.net (mfilter16-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id alIviRLsBLLh; Thu, 17 Dec 2015 07:21:50 +0100 (CET) X-Originating-IP: 82.241.130.121 Received: from builder.remirepo.net (pom51-2-82-241-130-121.fbx.proxad.net [82.241.130.121]) (Authenticated sender: contact@ll-experts.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 54C19A80CD; Thu, 17 Dec 2015 07:21:50 +0100 (CET) To: internals@lists.php.net, gwang@php.net References: <38ca88949339f5ac7beb2c479d4352e2@dreamcoder.dk> X-Enigmail-Draft-Status: N1110 Message-ID: <5672547D.6090901@fedoraproject.org> Date: Thu, 17 Dec 2015 07:21:49 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <38ca88949339f5ac7beb2c479d4352e2@dreamcoder.dk> Content-Type: multipart/mixed; boundary="------------040706050502020205080608" Subject: Re: [PHP-DEV] Push Litespeed SAPI 6.9 to PHP 7.0.1 From: remi@fedoraproject.org (Remi Collet) --------------040706050502020205080608 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Le 16/12/2015 14:41, Tom Sommer a écrit : > Hi > > I realise 7.0.1 is already out in RC1, but there is a bug in the > Litespeed 6.8 sapi which breaks php_flag and php_value. It's > causing our customers a lot of headaches. > > I see Litespeed 6.9 is already in master, but would it be possible > to get backported into 7.0.1? > > The fix is here: > https://github.com/php/php-src/commit/5bcb7a7019a49c2f80eda7d2aa947efe beee0034#diff-e8087496f5a642ce83e5d655c08c6b3a > > (I believe) > > Thanks Missing in 7.0 see diff-7.0.txt Missing in 7.0.1 see diff-7.0.1.txt Remi -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlZyVHoACgkQYUppBSnxahhtRwCgl23H+rKJYFYTQV22pJ/olGV+ hucAoMcUYM8W/rQb/M91lfnUkWZI8tSL =ofvT -----END PGP SIGNATURE----- --------------040706050502020205080608 Content-Type: text/plain; charset=UTF-8; name="diff-7.0.1.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="diff-7.0.1.txt" ZGlmZiAtLWdpdCBhL3NhcGkvbGl0ZXNwZWVkL2xzYXBpX21haW4uYyBiL3NhcGkvbGl0ZXNw ZWVkL2xzYXBpX21haW4uYwppbmRleCAxM2JjYTBjLi5lYmFhOTFmIDEwMDY0NAotLS0gYS9z YXBpL2xpdGVzcGVlZC9sc2FwaV9tYWluLmMKKysrIGIvc2FwaS9saXRlc3BlZWQvbHNhcGlf bWFpbi5jCkBAIC00MTgsNyArNDE4LDcgQEAgc3RhdGljIHZvaWQgc2FwaV9sc2FwaV9sb2df bWVzc2FnZShjaGFyICptZXNzYWdlKQogc3RhdGljIHNhcGlfbW9kdWxlX3N0cnVjdCBsc2Fw aV9zYXBpX21vZHVsZSA9CiB7CiAgICAgImxpdGVzcGVlZCIsCi0gICAgIkxpdGVTcGVlZCBW Ni44IiwKKyAgICAiTGl0ZVNwZWVkIFY2LjkiLAogCiAgICAgcGhwX2xzYXBpX3N0YXJ0dXAs ICAgICAgICAgICAgICAvKiBzdGFydHVwICovCiAgICAgcGhwX21vZHVsZV9zaHV0ZG93bl93 cmFwcGVyLCAgICAvKiBzaHV0ZG93biAqLwpAQCAtNjAyLDExICs2MDIsMTIgQEAgc3RhdGlj IGludCBhbHRlcl9pbmkoIGNvbnN0IGNoYXIgKiBwS2V5LCBpbnQga2V5TGVuLCBjb25zdCBj aGFyICogcFZhbHVlLCBpbnQgdmEKICAgICAgICAgZWxzZQogCQl7CiAjaWYgUEhQX01BSk9S X1ZFUlNJT04gPj0gNwotCQkJcHNLZXkgPSB6ZW5kX3N0cmluZ19pbml0KHBLZXksIGtleUxl biwgMSk7CisgICAgICAgICAgICAtLWtleUxlbjsKKyAgICAgICAgICAgIHBzS2V5ID0gemVu ZF9zdHJpbmdfaW5pdChwS2V5LCBrZXlMZW4sIDEpOwogICAgICAgICAgICAgemVuZF9hbHRl cl9pbmlfZW50cnlfY2hhcnMocHNLZXksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChjaGFyICopcFZhbHVlLCB2YWxMZW4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHR5cGUsIFBIUF9JTklfU1RBR0VfQUNUSVZBVEUpOwotCQkJemVuZF9zdHJpbmdfcmVsZWFz ZShwc0tleSk7CisgICAgICAgICAgICB6ZW5kX3N0cmluZ19yZWxlYXNlKHBzS2V5KTsKICNl bHNlCiAgICAgICAgICAgICB6ZW5kX2FsdGVyX2luaV9lbnRyeSgoY2hhciAqKXBLZXksIGtl eUxlbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNoYXIgKilwVmFsdWUsIHZh bExlbiwKQEAgLTc3MCw2ICs3NzEsOCBAQCBzdGF0aWMgaW50IGNsaV9tYWluKCBpbnQgYXJn YywgY2hhciAqIGFyZ3ZbXSApCiAKICAgICAgICAgemVuZF91di5odG1sX2Vycm9ycyA9IDA7 IC8qIHRlbGwgdGhlIGVuZ2luZSB3ZSdyZSBpbiBub24taHRtbCBtb2RlICovCiAgICAgICAg IENHKGluX2NvbXBpbGF0aW9uKSA9IDA7IC8qIG5vdCBpbml0aWFsaXplZCBidXQgbmVlZGVk IGZvciBzZXZlcmFsIG9wdGlvbnMgKi8KKyAgICAgICAgU0cob3B0aW9ucykgfD0gU0FQSV9P UFRJT05fTk9fQ0hESVI7CisgICAgICAgIAogI2lmIFBIUF9NQUpPUl9WRVJTSU9OIDwgNwog ICAgICAgICBFRyh1bmluaXRpYWxpemVkX3p2YWxfcHRyKSA9IE5VTEw7CiAjZW5kaWYKQEAg LTEyNDcsNyArMTI1MCw3IEBAIFBIUF9GVU5DVElPTihhcGFjaGVfZ2V0X21vZHVsZXMpCiB7 CiAgICAgc3RhdGljIGNvbnN0IGNoYXIgKiBtb2RfbmFtZXNbXSA9CiAgICAgewotICAgICAg ICAibW9kX3Jld3JpdGUiLCAibW9kX21pbWUiLCAibW9kX2hlYWRlcnMiLCAibW9kX2V4cGly ZXMiLCBOVUxMCisgICAgICAgICJtb2RfcmV3cml0ZSIsICJtb2RfbWltZSIsICJtb2RfaGVh ZGVycyIsICJtb2RfZXhwaXJlcyIsICJtb2RfYXV0aF9iYXNpYyIsIE5VTEwKICAgICB9Owog ICAgIGNvbnN0IGNoYXIgKipuYW1lID0gbW9kX25hbWVzOwogICAgIC8qIFRPRE86ICovCmRp ZmYgLS1naXQgYS9zYXBpL2xpdGVzcGVlZC9sc2FwaWxpYi5jIGIvc2FwaS9saXRlc3BlZWQv bHNhcGlsaWIuYwppbmRleCA2YWJhZjBkLi5hNTQyNzcxIDEwMDY0NAotLS0gYS9zYXBpL2xp dGVzcGVlZC9sc2FwaWxpYi5jCisrKyBiL3NhcGkvbGl0ZXNwZWVkL2xzYXBpbGliLmMKQEAg LTE0OTksNyArMTQ5OSw3IEBAIGludCBMU0FQSV9SZXFCb2R5R2V0TGluZV9yKCBMU0FQSV9S ZXF1ZXN0ICogcFJlcSwgY2hhciAqIHBCdWYsIHNpemVfdCBidWZMZW4sIGluCiAgICAgY2hh ciAqIHBCdWZDdXIgPSBwQnVmOwogICAgIGNoYXIgKiBwQ3VyOwogICAgIGNoYXIgKiBwOwot ICAgIGlmICghcFJlcSB8fCAocFJlcS0+bV9mZCA9PS0xKSB8fCggIXBCdWYgKXx8ICFnZXRM RiApCisgICAgaWYgKCFwUmVxIHx8IChwUmVxLT5tX2ZkID09LTEpIHx8KCAhcEJ1ZiApfHwo YnVmTGVuIDwgMCApfHwgIWdldExGICkKICAgICAgICAgcmV0dXJuIC0xOwogICAgICpnZXRM RiA9IDA7CiAgICAgd2hpbGUoIChsZWZ0ID0gcEJ1ZkVuZCAtIHBCdWZDdXIgKSA+IDAgKQpA QCAtMTU0Myw3ICsxNTQzLDcgQEAgc3NpemVfdCBMU0FQSV9SZWFkUmVxQm9keV9yKCBMU0FQ SV9SZXF1ZXN0ICogcFJlcSwgY2hhciAqIHBCdWYsIHNpemVfdCBidWZMZW4gKQogICAgIHNz aXplX3QgbGVuOwogICAgIG9mZl90IHRvdGFsOwogICAgIC8qIGNoYXIgKnBPbGRCdWYgPSBw QnVmOyAqLwotICAgIGlmICghcFJlcSB8fCAocFJlcS0+bV9mZCA9PS0xKSB8fCAoICFwQnVm ICkpCisgICAgaWYgKCFwUmVxIHx8IChwUmVxLT5tX2ZkID09LTEpIHx8ICggIXBCdWYgKXx8 KGJ1ZkxlbiA8IDAgKSkKICAgICAgICAgcmV0dXJuIC0xOwogCiAgICAgdG90YWwgPSBwUmVx LT5tX3JlcUJvZHlMZW4gLSBwUmVxLT5tX3JlcUJvZHlSZWFkOwo= --------------040706050502020205080608 Content-Type: text/plain; charset=UTF-8; name="diff-7.0.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="diff-7.0.txt" ZGlmZiAtLWdpdCBhL3NhcGkvbGl0ZXNwZWVkL2xzYXBpX21haW4uYyBiL3NhcGkvbGl0ZXNw ZWVkL2xzYXBpX21haW4uYwppbmRleCAwYzllYTQ5Li5lYmFhOTFmIDEwMDY0NAotLS0gYS9z YXBpL2xpdGVzcGVlZC9sc2FwaV9tYWluLmMKKysrIGIvc2FwaS9saXRlc3BlZWQvbHNhcGlf bWFpbi5jCkBAIC02MDIsMTEgKzYwMiwxMiBAQCBzdGF0aWMgaW50IGFsdGVyX2luaSggY29u c3QgY2hhciAqIHBLZXksIGludCBrZXlMZW4sIGNvbnN0IGNoYXIgKiBwVmFsdWUsIGludCB2 YQogICAgICAgICBlbHNlCiAJCXsKICNpZiBQSFBfTUFKT1JfVkVSU0lPTiA+PSA3Ci0JCQlw c0tleSA9IHplbmRfc3RyaW5nX2luaXQocEtleSwga2V5TGVuLCAxKTsKKyAgICAgICAgICAg IC0ta2V5TGVuOworICAgICAgICAgICAgcHNLZXkgPSB6ZW5kX3N0cmluZ19pbml0KHBLZXks IGtleUxlbiwgMSk7CiAgICAgICAgICAgICB6ZW5kX2FsdGVyX2luaV9lbnRyeV9jaGFycyhw c0tleSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNoYXIgKilwVmFsdWUsIHZh bExlbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHlwZSwgUEhQX0lOSV9TVEFH RV9BQ1RJVkFURSk7Ci0JCQl6ZW5kX3N0cmluZ19yZWxlYXNlKHBzS2V5KTsKKyAgICAgICAg ICAgIHplbmRfc3RyaW5nX3JlbGVhc2UocHNLZXkpOwogI2Vsc2UKICAgICAgICAgICAgIHpl bmRfYWx0ZXJfaW5pX2VudHJ5KChjaGFyICopcEtleSwga2V5TGVuLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoY2hhciAqKXBWYWx1ZSwgdmFsTGVuLApkaWZmIC0tZ2l0IGEv c2FwaS9saXRlc3BlZWQvbHNhcGlsaWIuYyBiL3NhcGkvbGl0ZXNwZWVkL2xzYXBpbGliLmMK aW5kZXggNmFiYWYwZC4uYTU0Mjc3MSAxMDA2NDQKLS0tIGEvc2FwaS9saXRlc3BlZWQvbHNh cGlsaWIuYworKysgYi9zYXBpL2xpdGVzcGVlZC9sc2FwaWxpYi5jCkBAIC0xNDk5LDcgKzE0 OTksNyBAQCBpbnQgTFNBUElfUmVxQm9keUdldExpbmVfciggTFNBUElfUmVxdWVzdCAqIHBS ZXEsIGNoYXIgKiBwQnVmLCBzaXplX3QgYnVmTGVuLCBpbgogICAgIGNoYXIgKiBwQnVmQ3Vy ID0gcEJ1ZjsKICAgICBjaGFyICogcEN1cjsKICAgICBjaGFyICogcDsKLSAgICBpZiAoIXBS ZXEgfHwgKHBSZXEtPm1fZmQgPT0tMSkgfHwoICFwQnVmICl8fCAhZ2V0TEYgKQorICAgIGlm ICghcFJlcSB8fCAocFJlcS0+bV9mZCA9PS0xKSB8fCggIXBCdWYgKXx8KGJ1ZkxlbiA8IDAg KXx8ICFnZXRMRiApCiAgICAgICAgIHJldHVybiAtMTsKICAgICAqZ2V0TEYgPSAwOwogICAg IHdoaWxlKCAobGVmdCA9IHBCdWZFbmQgLSBwQnVmQ3VyICkgPiAwICkKQEAgLTE1NDMsNyAr MTU0Myw3IEBAIHNzaXplX3QgTFNBUElfUmVhZFJlcUJvZHlfciggTFNBUElfUmVxdWVzdCAq IHBSZXEsIGNoYXIgKiBwQnVmLCBzaXplX3QgYnVmTGVuICkKICAgICBzc2l6ZV90IGxlbjsK ICAgICBvZmZfdCB0b3RhbDsKICAgICAvKiBjaGFyICpwT2xkQnVmID0gcEJ1ZjsgKi8KLSAg ICBpZiAoIXBSZXEgfHwgKHBSZXEtPm1fZmQgPT0tMSkgfHwgKCAhcEJ1ZiApKQorICAgIGlm ICghcFJlcSB8fCAocFJlcS0+bV9mZCA9PS0xKSB8fCAoICFwQnVmICl8fChidWZMZW4gPCAw ICkpCiAgICAgICAgIHJldHVybiAtMTsKIAogICAgIHRvdGFsID0gcFJlcS0+bV9yZXFCb2R5 TGVuIC0gcFJlcS0+bV9yZXFCb2R5UmVhZDsK --------------040706050502020205080608--