Merge tag 'release-1.12.16' into MAGETWO-42973-1-12-16

Zend Framework 1.12.16

- [504: Cannot parse huge documents in Zend&zendframework#95;Dom&zendframework#95;Query](zendframework#504)
- [599: Wrong return type in DocBlock of Zend&zendframework#95;Console&zendframework#95;Getopt::getOption()](zendframework#599)
- [600: Undefined property $config in Zend&zendframework#95;Http&zendframework#95;Client&zendframework#95;Adapter&zendframework#95;Curl](zendframework#600)
- [604: add doccomments to Zend&zendframework#95;Log covering its magic methods](zendframework#604)
- [606: Fix typo in Zend&zendframework#95;Cache-Backends documentation.](zendframework#606)
- [610: Add ß (Latin small letter sharp s) to .de domain IDNA check](zendframework#610)
- [612: Zend&zendframework#95;Validate&zendframework#95;Hostname does not validate NTP hostnames starting with '0' character](zendframework#612)

SECURITY UPDATES
----------------

- **ZF2015-07**: A number of components, including `Zend_Cloud`, `Zend_Search_Lucene`, and `Zend_Service_WindowsAzure` were creating directories with a liberal umask that could lead to local arbitrary code execution and/or local privilege escalation. This release contains a patch that ensures the directories are created using permissions of 0775 and files using 0664 (essentially umask 0002).

- **ZF2015-08**: ZF2014-06 uncovered an issue in the sqlsrv adapter provided by the framework whereby null bytes were not filtered correctly when generating SQL. A reporter discovered the same vulnerability is present in our PDO implementation when used with pdo_dblib, and could potentially be applied to other PDO adapters.  This release contains a patch to properly escape null bytes used in SQL queries across all PDO adapters shipped with the framework.

Conflicts:
	README.md

Author: Dale Sikkema

README.md

@@ -1,11 +1,11 @@
 INFORMATION
 ===================
 
-This is a fork from Zend Framework 1.12.15 Release.
+This is a fork from Zend Framework 1.12.16 Release.
 
 PURPOSE
 ---------------------------
-Contains latest stable release of Zend Framework plus performance improvements and bug fixes.
+Contains Zend Framework 1 plus performance improvements and bug fixes.
 
 LICENSE
 =======

documentation/manual/de/tutorials/quickstart-create-layout.xml

@@ -21,7 +21,7 @@
         Es gibt zwei Design Pattern die Zend Framework verwendet um Layouts zu implementieren:
         <ulink url="http://martinfowler.com/eaaCatalog/twoStepView.html">Two Step View</ulink> und
         <ulink
-            url="http://java.sun.com/blueprints/corej2eepatterns/Patterns/CompositeView.html">Composite
+            url="http://www.oracle.com/technetwork/java/compositeview-137722.html">Composite
             View</ulink>. <emphasis>Two Step View</emphasis> wird normalerweise mit dem <ulink
             url="http://www.martinfowler.com/eaaCatalog/transformView.html">Transform View</ulink>
         Pattern assoziiert; die grundsätzliche Idee besteht darin das die View der Anwendung eine
@@ -49,17 +49,17 @@
         getan werden indem der Befehl <command>zf enable layout</command> verwendet wird:
     </para>
 
-    <programlisting language="shell"><![CDATA[
-% zf enable layout
-Layouts have been enabled, and a default layout created at
-application/layouts/scripts/layout.phtml
-A layout entry has been added to the application config file.
-]]></programlisting>
-
+    <programlisting language="shell"><![CDATA[
+% zf enable layout
+Layouts have been enabled, and a default layout created at
+application/layouts/scripts/layout.phtml
+A layout entry has been added to the application config file.
+]]></programlisting>
+
     <para>
         Wie vom Kommando notiert wird <filename>application/configs/application.ini</filename>
-        aktualisiert und enthält jetzt das folgende im Abschnitt <constant>production</constant>:
-    </para>
+        aktualisiert und enthält jetzt das folgende im Abschnitt <constant>production</constant>:
+    </para>
 
     <programlisting language="ini"><![CDATA[
 ; application/configs/application.ini

documentation/manual/de/tutorials/view-placeholders-intro.xml

@@ -35,7 +35,7 @@
 
     <para>
         Diese Fragen werden im <ulink
-            url="http://java.sun.com/blueprints/corej2eepatterns/Patterns/CompositeView.html">Composite
+            url="http://www.oracle.com/technetwork/java/compositeview-137722.html">Composite
         View</ulink> Design Pattern behandelt. Ein Weg zu diesem Pattern ist es "hints" oder Inhalt
         für das Siteweite Layout anzubieten. Im Zend Framwork wird das durch spezialisierte View
         Helfer ermöglicht welche "placeholders" (Platzhalter) heißen. Platzhalter erlauben es einem

documentation/manual/en/module_specs/Zend_Cache-Backends.xml

@@ -95,7 +95,7 @@
                         <entry><emphasis>hashed_directory_perm</emphasis></entry>
                         <entry><type>Integer</type></entry>
                         <entry>0700</entry>
-                        <entry>Permissins for the hashed directory structure</entry>
+                        <entry>Permissions for the hashed directory structure</entry>
                     </row>
 
                     <row>

documentation/manual/en/tutorials/quickstart-create-layout.xml

@@ -19,7 +19,7 @@
         There are two design patterns that Zend Framework uses to implement layouts: <ulink
             url="http://martinfowler.com/eaaCatalog/twoStepView.html">Two Step View</ulink> and
         <ulink
-            url="http://java.sun.com/blueprints/corej2eepatterns/Patterns/CompositeView.html">Composite
+            url="http://www.oracle.com/technetwork/java/compositeview-137722.html">Composite
             View</ulink>. <emphasis>Two Step View</emphasis> is usually associated with the <ulink
             url="http://www.martinfowler.com/eaaCatalog/transformView.html">Transform View</ulink>
         pattern; the basic idea is that your application view creates a representation that is then

documentation/manual/en/tutorials/view-placeholders-intro.xml

@@ -32,7 +32,7 @@
 
     <para>
         These questions are addressed in the <ulink
-            url="http://java.sun.com/blueprints/corej2eepatterns/Patterns/CompositeView.html">Composite
+            url="http://www.oracle.com/technetwork/java/compositeview-137722.html">Composite
         View</ulink> design pattern. One approach to that pattern is to provide "hints" or content
         to the sitewide layout. In Zend Framework, this is achieved through specialized view helpers
         called "placeholders." Placeholders allow you to aggregate content, and then render that

documentation/manual/fr/tutorials/quickstart-create-layout.xml

@@ -20,7 +20,7 @@
         Il y a deux designs pattern que le Zend Framework utilise pour les layouts&#160;: <ulink
             url="http://martinfowler.com/eaaCatalog/twoStepView.html">Two Step View</ulink> et
         <ulink
-            url="http://java.sun.com/blueprints/corej2eepatterns/Patterns/CompositeView.html">Composite
+            url="http://www.oracle.com/technetwork/java/compositeview-137722.html">Composite
             View</ulink>. <emphasis>Two Step View</emphasis> est souvent associé au pattern <ulink
             url="http://www.martinfowler.com/eaaCatalog/transformView.html">Transform View</ulink>
         l'idée de base est que les vues de l'application créent une représentation qui est ensuite

documentation/manual/fr/tutorials/view-placeholders-intro.xml

@@ -34,7 +34,7 @@
 
     <para>
         Ces questions sont traitées dans le pattern <ulink
-            url="http://java.sun.com/blueprints/corej2eepatterns/Patterns/CompositeView.html">Composite
+            url="http://www.oracle.com/technetwork/java/compositeview-137722.html">Composite
         View</ulink>. Une approche de ce pattern est de proposer du contenu pour le layout global.
         Dans Zend Framework, ce mécanisme est implémenté au travers d'aides de vue spéciales
         appelées "placeholders." Les placeholders permettent d'agréger du contenu et de le rendre

documentation/manual/pl/tutorials/quickstart-create-layout.xml

@@ -23,7 +23,7 @@
         url="http://martinfowler.com/eaaCatalog/twoStepView.html">Widok dwustopniowy
         (Two Step View)</ulink> oraz
         <ulink
-        url="http://java.sun.com/blueprints/corej2eepatterns/Patterns/CompositeView.html">Widok
+        url="http://www.oracle.com/technetwork/java/compositeview-137722.html">Widok
         złożony (Composite View)</ulink>.
         <emphasis>Widok dwustopniowy</emphasis> jest najczęściej powiązany z <ulink
         url="http://www.martinfowler.com/eaaCatalog/transformView.html">Widokiem przekształconym

library/Zend/Cloud/StorageService/Adapter/FileSystem.php

@@ -104,7 +104,7 @@ public function storeItem($destinationPath, $data, $options = array())
     {
         $path = $this->_getFullPath($destinationPath);
         file_put_contents($path, $data);
-        chmod($path, 0777);
+        chmod($path, 0775);
     }
 
     /**