Commit:    cc36ed61f880f95e0d2ffda9614e1f762071e438
Author:    Stanislav Malyshev <smalys...@gmail.com>         Thu, 18 Dec 2014 
18:17:01 -0800
Parents:   000f683d8be4e74aa38c04b98f2c2037a3233a85
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=cc36ed61f880f95e0d2ffda9614e1f762071e438

Log:
5.4.36

Changed paths:
  M  ChangeLog-5.php
  M  archive/archive.xml
  A  archive/entries/2014-12-18-3.xml
  M  bin/news2html
  M  include/releases.inc
  M  include/version.inc
  A  releases/5_4_36.php


Diff:
diff --git a/ChangeLog-5.php b/ChangeLog-5.php
index dfc1661..1d418d2 100644
--- a/ChangeLog-5.php
+++ b/ChangeLog-5.php
@@ -114,6 +114,16 @@ site_header("PHP 5 ChangeLog", array("current" => "docs", 
"css" => array("change
 </ul></li>
 </ul>
 <!-- }}} --></section>
+<section class="version" id="5.4.36"><!-- {{{ 5.4.36 -->
+<h3>Version 5.4.36</h3>
+<b>18-Dec-2014</b>
+<ul><li>Core:
+<ul>
+  <li>Upgraded crypt_blowfish to version 1.3.</li>
+  <li><?php bugfix(68545); ?> (NULL pointer dereference in unserialize.c).</li>
+  <li><?php bugfix(68594); ?> (Use after free vulnerability in unserialize()) 
(CVE-2014-8142).</li>
+</ul>
+<!-- }}} --></section>
 
 <section class="version" id="5.6.3"><!-- {{{ 5.6.3 -->
 <h3>Version 5.6.3</h3>
diff --git a/archive/archive.xml b/archive/archive.xml
index 35aa327..8751008 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
     <uri>http://php.net/contact</uri>
     <email>php-webmaster@lists.php.net</email>
   </author>
+  <xi:include href="entries/2014-12-18-3.xml"/>
   <xi:include href="entries/2014-12-18-2.xml"/>
   <xi:include href="entries/2014-12-18-1.xml"/>
   <xi:include href="entries/2014-11-13-3.xml"/>
diff --git a/archive/entries/2014-12-18-3.xml b/archive/entries/2014-12-18-3.xml
new file mode 100644
index 0000000..dfd08d7
--- /dev/null
+++ b/archive/entries/2014-12-18-3.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom";>
+  <title>PHP 5.4.36 Released</title>
+  <id>http://php.net/archive/2014.php#id2014-12-18-3</id>
+  <published>2014-12-18T18:15:29-08:00</published>
+  <updated>2014-12-18T18:15:29-08:00</updated>
+  <category term="frontpage" label="PHP.net frontpage news"/>
+  <category term="releases" label="New PHP release"/>
+  <link href="http://php.net/index.php#id2014-12-18-3"; rel="alternate" 
type="text/html"/>
+  <link href="http://php.net/archive/2014.php#id2014-12-18-3"; rel="via" 
type="text/html"/>
+  <content type="xhtml">
+    <div xmlns="http://www.w3.org/1999/xhtml";>
+     <p>The PHP development team announces the immediate availability of PHP
+     5.4.36. Two security-related bugs were fixed in this release, including 
the fix for CVE-2014-8142.
+     
+     All PHP 5.4 users are encouraged to upgrade to this version.
+     </p>
+     
+     <p>For source downloads of PHP 5.4.36 please visit our <a 
href="http://www.php.net/downloads.php";>downloads page</a>,
+     Windows binaries can be found on <a 
href="http://windows.php.net/download/";>windows.php.net/download/</a>.
+     The list of changes is recorded in the <a 
href="http://www.php.net/ChangeLog-5.php#5.4.36";>ChangeLog</a>.
+     </p>
+     
+    </div>
+  </content>
+</entry>
diff --git a/bin/news2html b/bin/news2html
index fa432d2..8041cdc 100755
--- a/bin/news2html
+++ b/bin/news2html
@@ -16,7 +16,7 @@ $version = $argv[2];
 $inside = false;
 $entries = array();
 while(($ln = fgets($fp)) !== false) {
-       if(preg_match("/(.. ... ....), PHP $version/", $ln, $m)) {
+       if(preg_match("/(.. ... ....),? PHP $version/", $ln, $m)) {
                // got entry start
                $inside = true;
                $date = strtr($m[1], " ", "-");
diff --git a/include/releases.inc b/include/releases.inc
index 57281ae..6570602 100644
--- a/include/releases.inc
+++ b/include/releases.inc
@@ -787,6 +787,37 @@ $OLDRELEASES = array (
       'date' => '20 Jun 2013',
       'museum' => true,
     ),
+    '5.4.35' => 
+    array (
+      'announcement' => 
+      array (
+        'English' => '/releases/5_4_35.php',
+      ),
+      'source' => 
+      array (
+        0 => 
+        array (
+          'filename' => 'php-5.4.35.tar.bz2',
+          'name' => 'PHP 5.4.35 (tar.bz2)',
+          'md5' => '489cc8336488fb2e722ffa3c08f9c864',
+          'date' => '13 Nov 2014',
+        ),
+        1 => 
+        array (
+          'filename' => 'php-5.4.35.tar.gz',
+          'name' => 'PHP 5.4.35 (tar.gz)',
+          'md5' => 'da7bed3b65033c7f096c96572cd9ea45',
+          'date' => '13 Nov 2014',
+        ),
+        2 => 
+        array (
+          'link' => 'http://windows.php.net/download/#php-5.4',
+          'name' => 'Windows 5.4.35 binaries and source',
+        ),
+      ),
+      'date' => '13 Nov 2014',
+      'museum' => false,
+    ),
     '5.4.34' => 
     array (
       'announcement' => 
diff --git a/include/version.inc b/include/version.inc
index f50bd3b..f1f542e 100644
--- a/include/version.inc
+++ b/include/version.inc
@@ -41,11 +41,11 @@ $PHP_5_5_MD5     = array(
 $PHP_5_4_RC = false; // Current RC version (e.g., '5.6.7RC1') or false
 $PHP_5_4_RC_DATE = '4 Sep 2014';
 
-$PHP_5_4_VERSION         = "5.4.35";
-$PHP_5_4_DATE            = "13 Nov 2014";
+$PHP_5_4_VERSION         = "5.4.36";
+$PHP_5_4_DATE            = "18 Dec 2014";
 $PHP_5_4_MD5     = array(
-                       "tar.bz2"       => "489cc8336488fb2e722ffa3c08f9c864",
-                       "tar.gz"        => "da7bed3b65033c7f096c96572cd9ea45",
+                       "tar.bz2"       => "70e223be4bb460e465b7a9d7cb5b9cac",
+                       "tar.gz"        => "d724ec84124ec948a7a493b74546efef",
 );
 
 $RELEASES = array(
diff --git a/releases/5_4_36.php b/releases/5_4_36.php
new file mode 100644
index 0000000..cbea4c6
--- /dev/null
+++ b/releases/5_4_36.php
@@ -0,0 +1,21 @@
+<?php
+// $Id$
+$_SERVER['BASE_PAGE'] = 'releases/5_4_36.php';
+include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+site_header("PHP 5.4.36 Release Announcement");
+?>
+
+<h1>PHP 5.4.36 Release Announcement</h1>
+
+<p>The PHP development team announces the immediate availability of PHP
+5.4.36. Two security-related bugs were fixed in this release, including the 
fix for CVE-2014-8142.
+
+All PHP 5.4 users are encouraged to upgrade to this version.
+</p>        
+
+<p>For source downloads of PHP 5.4.36 please visit our <a 
href="http://www.php.net/downloads.php";>downloads page</a>,
+Windows binaries can be found on <a 
href="http://windows.php.net/download/";>windows.php.net/download/</a>.
+The list of changes is recorded in the <a 
href="http://www.php.net/ChangeLog-5.php#5.4.36";>ChangeLog</a>.
+</p>
+
+<?php site_footer(); ?>


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to