Преглед изворни кода

Merge branch 'version/bump'

Matthew Weier O'Phinney пре 10 година
родитељ
комит
3054bfd889
2 измењених фајлова са 4 додато и 19 уклоњено
  1. 3 18
      README.md
  2. 1 1
      library/Zend/Version.php

+ 3 - 18
README.md

@@ -7,27 +7,12 @@ Master: [![Build Status](https://api.travis-ci.org/zendframework/zf1.png?branch=
 RELEASE INFORMATION
 ===================
 
-Zend Framework 1.12.15 Release.
-Released on Aug 11, 2015.
+Zend Framework 1.12.16dev Release.
+Released on MMM DD, YYYY.
 
-IMPORTANT FIXES FOR 1.12.15
+IMPORTANT FIXES FOR 1.12.16
 ---------------------------
 
-This release contains several fixes that address backwards compatibility issues:
-
-- [#591](https://github.com/zendframework/zf1/pull/591) adds PHP 5.2 support for
-  the [ZF2015-06](http://framework.zend.com/security/advisory/ZF2015-06)
-  security fix introduced in 1.12.14.
-- [#587](https://github.com/zendframework/zf1/pull/587) fixes the regular
-  expression used to match a header in `Zend_Http_Response::extractHeaders()`
-  to ensure it allows any valid header name (previously, it failed with header
-  names that included `.` characters), as well as empty header values.
-- [#597](https://github.com/zendframework/zf1/pull/597) updates
-  `Zend_Http_Client_Adapter_Curl` to properly distinguish between the `timeout`
-  configuration setting (which should map to `CURLOPT_CONNECTTIMEOUT` and/or
-  `CURLOPT_CONNECTTIMEOUT_MS`) and the `request_timeout` setting (which should
-  map to `CURLOPT_TIMEOUT` and/or `CURLOPT_TIMEOUT_MS`).
-
 See http://framework.zend.com/changelog for full details.
 
 NEW FEATURES

+ 1 - 1
library/Zend/Version.php

@@ -32,7 +32,7 @@ final class Zend_Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '1.12.15';
+    const VERSION = '1.12.16dev';
 
     /**
      * The latest stable version Zend Framework available