DevHeads.net

Postings by Nikita Popov

com web/bugs: Add phpbugreports to spam mail list: include/functions.php

Link: <a href="http://git.php.net/?p=web/bugs.git;a=commitdiff;h=0ed3f812f80a074c641b50e3a8f11c2e5ce94a82" title="http://git.php.net/?p=web/bugs.git;a=commitdiff;h=0ed3f812f80a074c641b50e3a8f11c2e5ce94a82">http://git.php.net/?p=web/bugs.git;a=commitdiff;h=0ed3f812f80a074c641b50...</a>

Log:
Add phpbugreports to spam mail list

Same as rhsoft.

Changed paths:
M include/functions.php

Diff:
diff --git a/include/functions.php b/include/functions.php
index d261294..d5f033a 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -247,7 +247,7 @@ function is_spam($string)
/* Primitive check for SPAMmy user. Add more later.

com web/gcov: Removed year from copyright headers: cron/check_parameters.php cron/compile_results.php cron/config.php cron/cron.php cron/cron.sh cron/database.php cron/find_tested.php cron/graph.php cron/system.php cron/tests.php www/compi

Link: <a href="http://git.php.net/?p=web/gcov.git;a=commitdiff;h=80183c679af80626961623c1e7790caf06f1755a" title="http://git.php.net/?p=web/gcov.git;a=commitdiff;h=80183c679af80626961623c1e7790caf06f1755a">http://git.php.net/?p=web/gcov.git;a=commitdiff;h=80183c679af80626961623...</a>

Log:
Removed year from copyright headers

Changed paths:
M cron/check_parameters.php
M cron/compile_results.php
M cron/config.php
M cron/cron.php
M cron/cron.sh
M cron/database.php
M cron/find_tested.php
M cron/graph.php
M cron/system.php
M cron/tests.php
M www/compile_results.php
M www/config.php
M www/expected_tests.php
M www/graph.php
M www/index.php
M www/lcov.php
M www/params.php
M www/site.api.php
M www/skip.php
M www/stats.ph

com web/master: Use mailout.php.net instead of php-smtp2.php.net: entry/subscribe.php

Link: <a href="http://git.php.net/?p=web/master.git;a=commitdiff;h=5b598f2bab8284240ca756bb9d995d1d2b7e5702" title="http://git.php.net/?p=web/master.git;a=commitdiff;h=5b598f2bab8284240ca756bb9d995d1d2b7e5702">http://git.php.net/?p=web/master.git;a=commitdiff;h=5b598f2bab8284240ca7...</a>

Log:
Use mailout.php.net instead of php-smtp2.php.net

This is an alias for the current php-smtp3.php.net name.

Changed paths:
M entry/subscribe.php

Diff:
diff --git a/entry/subscribe.php b/entry/subscribe.php
index 350a11d..e25f382 100644
--- a/entry/subscribe.php
+++ b/entry/subscribe.php
@@ -38,7 +38,7 @@ date_default_timezone_set('Etc/UTC');
$mail = new PHPMailer;
$mail->isSMTP();
$mail->SMTPDebug = 0;
-$mail->Host = 'php-smtp2.php.net';
+$mail->Host = 'mailout.php.net';
$mai

com web/php: Update git.php branches: git.php

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=519d9fa7dd4eef019e90b96aa5ed04621dddd99e" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=519d9fa7dd4eef019e90b96aa5ed04621dddd99e">http://git.php.net/?p=web/php.git;a=commitdiff;h=519d9fa7dd4eef019e90b96...</a>

Log:
Update git.php branches

Add PHP-7.4, remove PHP-5.6 and PHP-7.0, which are EOL.

Changed paths:
M git.php

Diff:
diff --git a/git.php b/git.php
index a811e49..e394860 100644
--- a/git.php
+++ b/git.php
@@ -101,12 +101,6 @@ site_header("Git Access", array("current" => "community"));
<li>
You can then check out the branch you want to build, for example:
<br><br>
- <strong>PHP 5.6</strong>:
- <code>git checkout PHP-5.6</code>

com web/wiki: Add myself to admins: dokuwiki/conf/local.protected.php

Link: <a href="http://git.php.net/?p=web/wiki.git;a=commitdiff;h=65994a731c14f0a41e9a3a996f9e457c7a908964" title="http://git.php.net/?p=web/wiki.git;a=commitdiff;h=65994a731c14f0a41e9a3a996f9e457c7a908964">http://git.php.net/?p=web/wiki.git;a=commitdiff;h=65994a731c14f0a41e9a3a...</a>

Log:
Add myself to admins

Changed paths:
M dokuwiki/conf/local.protected.php

Diff:
diff --git a/dokuwiki/conf/local.protected.php b/dokuwiki/conf/local.protected.php
index a1690a8..b26185d 100644
--- a/dokuwiki/conf/local.protected.php
+++ b/dokuwiki/conf/local.protected.php
@@ -8,6 +8,7 @@ $conf['auth']['phpcvs'] = array('admins' => array(
'krakjoe',
'levim',
'lsmith',
+ 'nikic',
'pajoye',
'philip',
'pollita',

com web/gcov: Remove unused Git attributes ident: cron/check_parameters.php cron/compile_results.php cron/config.php cron/cron.php cron/cron.sh cron/database.php cron/find_tested.php cron/graph.php cron/system.php cron/tests.php www/compil

Link: <a href="http://git.php.net/?p=web/gcov.git;a=commitdiff;h=89fe54d765e195876bbbdc6b95fd4bc1359f8960" title="http://git.php.net/?p=web/gcov.git;a=commitdiff;h=89fe54d765e195876bbbdc6b95fd4bc1359f8960">http://git.php.net/?p=web/gcov.git;a=commitdiff;h=89fe54d765e195876bbbdc...</a>

Log:
Remove unused Git attributes ident

The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.

In Git this functionality is different and can be done with Git attribute
ident.

com web/bugs: Add myself to trusted devs: include/trusted-devs.php

Link: <a href="http://git.php.net/?p=web/bugs.git;a=commitdiff;h=c5993bac38f1a40e2dde5cff36d9099536e9408c" title="http://git.php.net/?p=web/bugs.git;a=commitdiff;h=c5993bac38f1a40e2dde5cff36d9099536e9408c">http://git.php.net/?p=web/bugs.git;a=commitdiff;h=c5993bac38f1a40e2dde5c...</a>

Log:
Add myself to trusted devs

I'm going to be removing rude comments by rhsoft.

Changed paths:
M include/trusted-devs.php

Diff:
diff --git a/include/trusted-devs.php b/include/trusted-devs.php
index e2a7019..59427ca 100644
--- a/include/trusted-devs.php
+++ b/include/trusted-devs.php
@@ -17,7 +17,8 @@ $trusted_developers = array(
'zeev',
'pollita',
'kalle',
- 'danbrown'
+ 'danbrown',
+ 'nikic',
);

// Distro people (security related)

com web/php: Use 2018 in license/3_01.txt: license/3_01.txt

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=3ba133089d994668a29c635a6b6f1b5a419ac965" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=3ba133089d994668a29c635a6b6f1b5a419ac965">http://git.php.net/?p=web/php.git;a=commitdiff;h=3ba133089d994668a29c635...</a>

Log:
Use 2018 in license/3_01.txt

Changed paths:
M license/3_01.txt

Diff:
diff --git a/license/3_01.txt b/license/3_01.txt
index 9964e07..49c344f 100644
--- a/license/3_01.txt
+++ b/license/3_01.txt
@@ -1,6 +1,6 @@

com web/php: 7.1.15RC1: include/version.inc

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=ff96856fd98205a5708a6932651c214f2c3fad7d" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=ff96856fd98205a5708a6932651c214f2c3fad7d">http://git.php.net/?p=web/php.git;a=commitdiff;h=ff96856fd98205a5708a693...</a>

Log:
7.1.15RC1

Changed paths:
M include/version.inc

Diff:
diff --git a/include/version.inc b/include/version.inc
index 6561492..b735fb5 100644
--- a/include/version.inc
+++ b/include/version.inc
@@ -29,8 +29,8 @@ $PHP_7_2_SHA256 = array(
);

/* PHP 7.1 Release */
-$PHP_7_1_RC = false; // Current RC version (e.g., '5.6.7RC1') or false
-$PHP_7_1_RC_DATE = "18 Jan 2018";;
+$PHP_7_1_RC = "7.1.15RC1"; // Current RC version (e.g., '5.6.7RC1') or false
+$PHP_7_1_RC_DATE = "15 Feb 2018";

com web/master: Try to debug github webhook: github-webhook.php

Link: <a href="http://git.php.net/?p=web/master.git;a=commitdiff;h=d1bcd88aad1fafe0046de68b250e69d5681ce2c2" title="http://git.php.net/?p=web/master.git;a=commitdiff;h=d1bcd88aad1fafe0046de68b250e69d5681ce2c2">http://git.php.net/?p=web/master.git;a=commitdiff;h=d1bcd88aad1fafe0046d...</a>

Log:
Try to debug github webhook

Working fine when manually providing a payload, but I'm not getting
any mails...

Changed paths:
M github-webhook.php

Diff:
diff --git a/github-webhook.php b/github-webhook.php
index c6480eb..9004252 100644
--- a/github-webhook.php
+++ b/github-webhook.php
@@ -33,6 +33,13 @@ function prep_title($issue, $repoName) {
return $subject;
}

+function send_mail($to, $subject, $message, $headers) {
+ printf("Sending mail...\nTo: %s\nSubject: %s\nMes

com web/master: Show "Issue" instead of "Pull Request" in a few more places: github-webhook.php

Link: <a href="http://git.php.net/?p=web/master.git;a=commitdiff;h=3210ab0d11bf5411ba1bf223e0deb5270d735f05" title="http://git.php.net/?p=web/master.git;a=commitdiff;h=3210ab0d11bf5411ba1bf223e0deb5270d735f05">http://git.php.net/?p=web/master.git;a=commitdiff;h=3210ab0d11bf5411ba1b...</a>

Log:
Show "Issue" instead of "Pull Request" in a few more places

Changed paths:
M github-webhook.php

Diff:
diff --git a/github-webhook.php b/github-webhook.php
index b1e7210..c6480eb 100644
--- a/github-webhook.php
+++ b/github-webhook.php
@@ -19,10 +19,14 @@ function get_repo_email($repos, $repoName) {
return $to;
}

+function is_pr($issue) {
+ return strpos($issue->html_url, '/pull/') !== false;
+}
+
function prep_title($issue, $repoName) {
$issueNumber = $issue->nu

com web/master: Retab file: github-webhook.php

Link: <a href="http://git.php.net/?p=web/master.git;a=commitdiff;h=8724f9674722fed9060c044d5df6504f4db8d4ff" title="http://git.php.net/?p=web/master.git;a=commitdiff;h=8724f9674722fed9060c044d5df6504f4db8d4ff">http://git.php.net/?p=web/master.git;a=commitdiff;h=8724f9674722fed9060c...</a>

Log:
Retab file

Changed paths:
M github-webhook.php

Diff:
diff --git a/github-webhook.php b/github-webhook.php
index e2ebd35..b1e7210 100644
--- a/github-webhook.php
+++ b/github-webhook.php
@@ -1,10 +1,10 @@
<?php
function verify_signature($requestBody) {
- if (isset($_SERVER['HTTP_X_HUB_SIGNATURE'])){
- $sig = 'sha1=' .

com web/master: Support issues in github webhook: github-webhook.php

Link: <a href="http://git.php.net/?p=web/master.git;a=commitdiff;h=6bd9ac552a382e63a14a4e03e9d91497a40b5bc0" title="http://git.php.net/?p=web/master.git;a=commitdiff;h=6bd9ac552a382e63a14a4e03e9d91497a40b5bc0">http://git.php.net/?p=web/master.git;a=commitdiff;h=6bd9ac552a382e63a14a...</a>

Log:
Support issues in github webhook

It does not look like the webhook payloads explicitly tell you
whether an issue comment is on a issue or PR.

com web/master: Improve GitHub signature validation: github-webhook.php

Link: <a href="http://git.php.net/?p=web/master.git;a=commitdiff;h=01d6ba78b9253a4e00be402288b998527cf2dcab" title="http://git.php.net/?p=web/master.git;a=commitdiff;h=01d6ba78b9253a4e00be402288b998527cf2dcab">http://git.php.net/?p=web/master.git;a=commitdiff;h=01d6ba78b9253a4e00be...</a>

Log:
Improve GitHub signature validation

We should not let the client decide the authentication method, see
<a href="https://www.wordfence.com/blog/2016/11/hacking-27-web-via-wordpress-auto-update/" title="https://www.wordfence.com/blog/2016/11/hacking-27-web-via-wordpress-auto-update/">https://www.wordfence.com/blog/2016/11/hacking-27-web-via-wordpress-auto...</a>

Changed paths:
M github-webhook.php

Diff:
diff --git a/github-webhook.php b/github-webhook.php
index f756e81..f52f1b4 100644
--- a/github-webhook.php
+++ b/github-webhook.php
@@ -1,10 +1,8 @@
<?php
function verify_signature($requestBody) {
- if(isset($_SERVER['HTTP_X_HUB_SIGNATURE'])){
- $parts

com web/master: Handle pull request comments as well: github-webhook.php

Link: <a href="http://git.php.net/?p=web/master.git;a=commitdiff;h=8d529985963af580d218d416de1abe763be89d2d" title="http://git.php.net/?p=web/master.git;a=commitdiff;h=8d529985963af580d218d416de1abe763be89d2d">http://git.php.net/?p=web/master.git;a=commitdiff;h=8d529985963af580d218...</a>

Log:
Handle pull request comments as well

These are distinct from review comments.

I've cannibalized the base-branch in the mail subject to support
this easily.

com web/master: Try to make PR mails less spammy: github-webhook.php

Link: <a href="http://git.php.net/?p=web/master.git;a=commitdiff;h=2320705c2bcedccf694c8e88eb3e6c1a7bb247f6" title="http://git.php.net/?p=web/master.git;a=commitdiff;h=2320705c2bcedccf694c8e88eb3e6c1a7bb247f6">http://git.php.net/?p=web/master.git;a=commitdiff;h=2320705c2bcedccf694c...</a>

Log:
Try to make PR mails less spammy

Changed paths:
M github-webhook.php

Diff:
diff --git a/github-webhook.php b/github-webhook.php
index 2a5b08c..7578916 100644
--- a/github-webhook.php
+++ b/github-webhook.php
@@ -51,25 +51,44 @@ if (!verify_signature($body)) {
}

$payload = json_decode($body);
+$action = $payload->action;
$PR = $payload->pull_request;
$htmlUrl = $PR->html_url;
$repoName = $PR->base->repo->name;
-$description = $PR->body;

-switch ($_SERVER['HTTP_X_GITHUB_

com web/master: Fix pull_request_review_comment handling: github-webhook.php

Link: <a href="http://git.php.net/?p=web/master.git;a=commitdiff;h=4611f79bd1cb18e53ee1fd55e541e2999a5d6d00" title="http://git.php.net/?p=web/master.git;a=commitdiff;h=4611f79bd1cb18e53ee1fd55e541e2999a5d6d00">http://git.php.net/?p=web/master.git;a=commitdiff;h=4611f79bd1cb18e53ee1...</a>

Log:
Fix pull_request_review_comment handling

Changed paths:
M github-webhook.php

Diff:
diff --git a/github-webhook.php b/github-webhook.php
index e3097c2..2a5b08c 100644
--- a/github-webhook.php
+++ b/github-webhook.php
@@ -75,13 +75,13 @@ switch ($_SERVER['HTTP_X_GITHUB_EVENT']) {
break;

case 'pull_request_review_comment':
- $username = $payload->user->login;
+ $username = $payload->comment->user->login;
$comment = $payload->comment->body;

$to

com web/bugs: Give myself access to sec bugs: include/trusted-devs.php

Link: <a href="http://git.php.net/?p=web/bugs.git;a=commitdiff;h=60a0a26f8d6d4b935220bf5f6f42114e59ef2e09" title="http://git.php.net/?p=web/bugs.git;a=commitdiff;h=60a0a26f8d6d4b935220bf5f6f42114e59ef2e09">http://git.php.net/?p=web/bugs.git;a=commitdiff;h=60a0a26f8d6d4b935220bf...</a>

Log:
Give myself access to sec bugs

Changed paths:
M include/trusted-devs.php

Diff:
diff --git a/include/trusted-devs.php b/include/trusted-devs.php
index bb56902..0bb412f 100644
--- a/include/trusted-devs.php
+++ b/include/trusted-devs.php
@@ -61,6 +61,7 @@ $security_developers = array(
'kaplan',
'davey',
'krakjoe',
+ 'nikic',
);

$security_developers = array_merge($security_developers, $security_distro_people);