marc1706

[    0.000000] Initializing cgroup subsys cpu
[    0.000000] Linux version 3.0.16-marc1706+ (root@marc-G71GX) (gcc version 4.4.1 (Sourcery G++ Lite 2010q1-188) ) #56 PREEMPT Sat Jun 29 16:41:20 CEST 2013
[    0.000000] CPU: ARMv7 Processor [510f00f2] revision 2 (ARMv7), cr=10c53c7d
[    0.000000] CPU: VIPT nonaliasing data cache, VIVT ASID tagged instruction cache
[    0.000000] Machine: htcleo
[    0.000000] Nand Boot: 2
[    0.000000] Partition (from atag) lk -- Offset:212 Size:3
[    0.000000] Partition (from atag) recovery -- Offset:216 Size:30
[    0.000000] Partition (from atag) boot -- Offset:246 Size:28
[    0.000000] Partition (from atag) misc -- Offset:26e Size:8

marc1706

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index a134fab..09f02b1 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1173,6 +1173,20 @@ class parse_message extends bbcode_firstpass
 			}
 		}
 
+		// Check for out-of-bounds characters that are currently
+		// not supported by utf8_bin

marc1706

marc@marc-G71GX ~/Dokumente/Entwicklung/phpbb3 $ sudo phpunit -c phpunit.xml.functional "tests/functional/report_post_captcha.php"
PHPUnit 3.7.22 by Sebastian Bergmann.

Configuration read from /home/marc/Dokumente/Entwicklung/phpbb3/phpunit.xml.functional

F.

Time: 14 seconds, Memory: 11.25Mb

There was 1 failure:

marc1706

wget https://phar.phpunit.de/phpcpd.phar
find -name *.php | xargs php phpcpd.phar --log-pmd ../report_name.xml

marc1706

<?xml version="1.0" encoding="UTF-8"?>
<pmd-cpd>
  <duplication lines="8" tokens="36">
    <file path="/home/marc/Dokumente/Entwicklung/phpbb3/phpBB/phpbb/session.php" line="373"/>
    <file path="/home/marc/Dokumente/Entwicklung/phpbb3/phpBB/phpbb/session.php" line="692"/>
    <codefragment>                if (strpos($this-&gt;ip, ':') !== false &amp;&amp; strpos($this-&gt;data['session_ip'], ':') !== false)
                {
                    $s_ip = short_ipv6($this-&gt;data['session_ip'], $config['ip_check']);
                    $u_ip = short_ipv6($this-&gt;ip, $config['ip_check']);
                }

marc1706

PHPUnit 3.7.27 by Sebastian Bergmann.

Configuration read from /home/marc/Dokumente/Entwicklung/phpbb3/phpunit.xml.dist

.............................................................   61 / 2210 (  2%)
......................I.....SSSS.......SSSS..................  122 / 2210 (  5%)
.............................................................  183 / 2210 (  8%)
.............................................................  244 / 2210 ( 11%)
.............................................................  305 / 2210 ( 13%)
.............................................................  366 / 2210 ( 16%)

marc1706

Requirements

Make sure node and npm are installed. The easiest way is to install node via the available installers: https://nodejs.org/en/download/

Please ensure to use the 4.x LTS version instead of the latest 5.x version. For installing node and npm on debian based distros, these instructions might also work: https://www.digitalocean.com/community/tutorials/how-to-install-node-js-on-an-ubuntu-14-04-server

The easiest way is to use nvm. Simply install it as described here:

marc1706

##Find everything enclosed in tags <primaryAddress>[\s\S]*?<\/primaryAddress>

Use i Modifier for finding across lines!

marc1706

#!/bin/bash

set -e

PR=$1

git checkout 3.2.x && git fetch upstream && git fetch origin && git reset --hard upstream/3.2.x && hub merge $1 && git push origin 3.2.x
git checkout 3.3.x && git reset --hard upstream/3.3.x && git merge --no-ff --no-edit 3.2.x && git push origin 3.3.x
git checkout master && git reset --hard upstream/master && git merge --no-ff --no-edit 3.3.x && git push origin master

marc1706

Todo List for 3.1.10

General

• Make sure phpBB/docs/CREDTIS.txt is up to date: phpbb/phpbb#4451
• Make sure Contributors have their ranks
• Make sure all reports in the security tracker are closed or invalid
• Go through Issues fixed in 3.1.10 and correct any unreadable descriptions
• Check the feature hightlights wiki page for completeness
• Branch of prep-release-3.1.10 from 3.1.x: