From 13d6bdc723dab33684d01d45f9840e035e7b53f7 Mon Sep 17 00:00:00 2001 From: Sergey Dryabzhinsky Date: Sat, 10 Sep 2016 02:00:41 +0300 Subject: [PATCH] Upload ZF 1.12.20 --- CONTRIBUTING.md | 15 ++++++++- README.md | 31 +++++++++++++------ extras/README.md | 4 +-- .../ZendX_Application_Resource_Jquery.html | 2 +- .../classes/ZendX_Console_Exception.html | 2 +- .../ZendX_Console_Process_Exception.html | 2 +- .../classes/ZendX_Console_Process_Unix.html | 2 +- .../classes/ZendX_Db_Adapter_Firebird.html | 2 +- .../ZendX_Db_Adapter_Firebird_Exception.html | 2 +- .../classes/ZendX_Db_Statement_Firebird.html | 2 +- ...ZendX_Db_Statement_Firebird_Exception.html | 2 +- .../api/extras/classes/ZendX_Exception.html | 2 +- .../api/extras/classes/ZendX_JQuery.html | 2 +- ...Controller_Action_Helper_AutoComplete.html | 2 +- .../classes/ZendX_JQuery_Exception.html | 2 +- .../api/extras/classes/ZendX_JQuery_Form.html | 2 +- ...ery_Form_Decorator_AccordionContainer.html | 2 +- ...X_JQuery_Form_Decorator_AccordionPane.html | 2 +- ...JQuery_Form_Decorator_DialogContainer.html | 2 +- ...dX_JQuery_Form_Decorator_TabContainer.html | 2 +- .../ZendX_JQuery_Form_Decorator_TabPane.html | 2 +- ...uery_Form_Decorator_UiWidgetContainer.html | 2 +- ...JQuery_Form_Decorator_UiWidgetElement.html | 2 +- ..._Form_Decorator_UiWidgetElementMarker.html | 2 +- ...dX_JQuery_Form_Decorator_UiWidgetPane.html | 2 +- ...endX_JQuery_Form_Element_AutoComplete.html | 2 +- ...ZendX_JQuery_Form_Element_ColorPicker.html | 2 +- .../ZendX_JQuery_Form_Element_DatePicker.html | 2 +- .../ZendX_JQuery_Form_Element_Slider.html | 2 +- .../ZendX_JQuery_Form_Element_Spinner.html | 2 +- .../ZendX_JQuery_Form_Element_UiWidget.html | 2 +- .../classes/ZendX_JQuery_Form_Exception.html | 2 +- .../classes/ZendX_JQuery_View_Exception.html | 2 +- ...JQuery_View_Helper_AccordionContainer.html | 2 +- ...endX_JQuery_View_Helper_AccordionPane.html | 2 +- .../ZendX_JQuery_View_Helper_AjaxLink.html | 2 +- ...ZendX_JQuery_View_Helper_AutoComplete.html | 2 +- .../ZendX_JQuery_View_Helper_ColorPicker.html | 2 +- .../ZendX_JQuery_View_Helper_DatePicker.html | 2 +- ...dX_JQuery_View_Helper_DialogContainer.html | 2 +- .../ZendX_JQuery_View_Helper_JQuery.html | 2 +- ...X_JQuery_View_Helper_JQuery_Container.html | 2 +- .../ZendX_JQuery_View_Helper_Slider.html | 2 +- .../ZendX_JQuery_View_Helper_Spinner.html | 2 +- ...ZendX_JQuery_View_Helper_TabContainer.html | 2 +- .../ZendX_JQuery_View_Helper_TabPane.html | 2 +- .../ZendX_JQuery_View_Helper_UiWidget.html | 2 +- ...ZendX_JQuery_View_Helper_UiWidgetPane.html | 2 +- .../documentation/api/extras/deprecated.html | 2 +- extras/documentation/api/extras/errors.html | 2 +- extras/documentation/api/extras/index.html | 2 +- extras/documentation/api/extras/markers.html | 2 +- .../api/extras/namespaces/global.html | 2 +- .../api/extras/packages/Default.html | 2 +- .../api/extras/packages/ZendX.html | 2 +- .../packages/ZendX_Application.Resource.html | 2 +- .../extras/packages/ZendX_Application.html | 2 +- .../api/extras/packages/ZendX_Console.html | 2 +- .../api/extras/packages/ZendX_Db.Adapter.html | 2 +- .../extras/packages/ZendX_Db.Statement.html | 2 +- .../api/extras/packages/ZendX_Db.html | 2 +- .../extras/packages/ZendX_JQuery.Form.html | 2 +- .../extras/packages/ZendX_JQuery.View.html | 2 +- .../api/extras/packages/ZendX_JQuery.html | 2 +- .../api/extras/packages/ZendX_Whois.html | 2 +- .../api/extras/packages/global.html | 2 +- .../documentation/manual/extras/en/index.html | 4 +-- .../manual/extras/en/the.index.html | 4 +-- .../extras/en/zendx.console.process.unix.html | 2 +- .../manual/extras/en/zendx.jquery.html | 2 +- library/Zend/Db/Select.php | 29 +++++++++++++++-- library/Zend/Version.php | 2 +- tests/Zend/Db/Select/StaticTest.php | 16 ++++++++++ 73 files changed, 150 insertions(+), 85 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2894df59..c864e957 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,18 @@ # CONTRIBUTING +> ## End-of-Life occurs 28 Sep 2016 +> +> Between now and 28 Sep 2016, we will only be accepting security patches to +> this repository; after that date, we will issue no more releases. +> +> For more information: +> +> - https://framework.zend.com/blog/2016-06-28-zf1-eol.html + +--- + +> ## Contributors License Agreement +> > **To submit code, patches, and proposals to Zend Framework, contributors must agree to the New BSD License and also submit a signed [Contributor License Agreement (CLA)](https://github.com/zendframework/zf1/wiki/Contributor-License-Agreement-%28CLA%29).** @@ -38,4 +51,4 @@ contributors a chance to resolve the vulnerability and issue a new release prior to any public exposure; this helps protect Zend Framework users and provides them with a chance to upgrade and/or update in order to protect their applications. -For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc). \ No newline at end of file +For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc). diff --git a/README.md b/README.md index eb2ed0e2..911b4046 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,16 @@ ![Logo](http://framework.zend.com/images/logos/ZendFramework-logo.png) +> ## End-of-Life occurs 28 Sep 2016 +> +> Between now and 28 Sep 2016, we will only be accepting security patches to +> this repository; after that date, we will issue no more releases. +> +> For more information: +> +> - https://framework.zend.com/blog/2016-06-28-zf1-eol.html + +--- + Welcome to the Zend Framework 1.12 Release! Master: [![Build Status](https://api.travis-ci.org/zendframework/zf1.png?branch=master)](https://travis-ci.org/zendframework/zf1) @@ -7,19 +18,21 @@ Master: [![Build Status](https://api.travis-ci.org/zendframework/zf1.png?branch= RELEASE INFORMATION =================== -Zend Framework 1.12.18 Release. -Released on Apr 13, 2016. +Zend Framework 1.12.20 Release. +Released on September 08, 2016. -IMPORTANT FIXES FOR 1.12.18 +IMPORTANT FIXES FOR 1.12.20 --------------------------- -This release contains security fixes: +**This release contains security updates:** -- **ZF2016-01**: A number of classes, including `Zend_Filter_Encrypt`, - `Zend_Form_Element_Hash`, `Zend_Gdata_HttpClient`, `Zend_Ldap_Attribute`, - and `Zend_OpenId`, were using randomization methods with insufficient entropy. - They have been updated to each use `Zend_Crypt_Math`, and the latter was - updated to use PHP 7's `random_bytes()` and `random_int()` where feasible. +- **ZF2016-03:** The implementation of `ORDER BY` and `GROUP BY` in + `Zend_Db_Select` remained prone to SQL injection when a combination of SQL + expressions and comments were used. This release provides a comprehensive + solution that identifies and removes comments prior to checking validity of + the statement to ensure no SQLi vectors occur. We advise always filtering user + input prior to invoking these methods, however, to further protect your + applications. See http://framework.zend.com/changelog for full details. diff --git a/extras/README.md b/extras/README.md index 87553086..a62ff2ff 100644 --- a/extras/README.md +++ b/extras/README.md @@ -7,8 +7,8 @@ Master: [![Build Status](https://api.travis-ci.org/zendframework/zf1-extras.png? RELEASE INFORMATION =================== -Zend Framework Extras 1.12.18 Release. -Released on Apr 13, 2016. +Zend Framework Extras 1.12.20 Release. +Released on September 08, 2016. MIGRATION NOTES =============== diff --git a/extras/documentation/api/extras/classes/ZendX_Application_Resource_Jquery.html b/extras/documentation/api/extras/classes/ZendX_Application_Resource_Jquery.html index 1b1b4d1c..69465500 100644 --- a/extras/documentation/api/extras/classes/ZendX_Application_Resource_Jquery.html +++ b/extras/documentation/api/extras/classes/ZendX_Application_Resource_Jquery.html @@ -205,7 +205,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_Console_Exception.html b/extras/documentation/api/extras/classes/ZendX_Console_Exception.html index 3578faa3..25fab480 100644 --- a/extras/documentation/api/extras/classes/ZendX_Console_Exception.html +++ b/extras/documentation/api/extras/classes/ZendX_Console_Exception.html @@ -106,7 +106,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_Console_Process_Exception.html b/extras/documentation/api/extras/classes/ZendX_Console_Process_Exception.html index dfe3e762..76a164b2 100644 --- a/extras/documentation/api/extras/classes/ZendX_Console_Process_Exception.html +++ b/extras/documentation/api/extras/classes/ZendX_Console_Process_Exception.html @@ -106,7 +106,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_Console_Process_Unix.html b/extras/documentation/api/extras/classes/ZendX_Console_Process_Unix.html index 5ea917ad..e52ece12 100644 --- a/extras/documentation/api/extras/classes/ZendX_Console_Process_Unix.html +++ b/extras/documentation/api/extras/classes/ZendX_Console_Process_Unix.html @@ -614,7 +614,7 @@ and server possible.
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_Db_Adapter_Firebird.html b/extras/documentation/api/extras/classes/ZendX_Db_Adapter_Firebird.html index d6dd4dd5..180c8272 100644 --- a/extras/documentation/api/extras/classes/ZendX_Db_Adapter_Firebird.html +++ b/extras/documentation/api/extras/classes/ZendX_Db_Adapter_Firebird.html @@ -505,7 +505,7 @@ Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_Db_Adapter_Firebird_Exception.html b/extras/documentation/api/extras/classes/ZendX_Db_Adapter_Firebird_Exception.html index 99404981..eb86d517 100644 --- a/extras/documentation/api/extras/classes/ZendX_Db_Adapter_Firebird_Exception.html +++ b/extras/documentation/api/extras/classes/ZendX_Db_Adapter_Firebird_Exception.html @@ -102,7 +102,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_Db_Statement_Firebird.html b/extras/documentation/api/extras/classes/ZendX_Db_Statement_Firebird.html index 3d376b1d..cf2c301e 100644 --- a/extras/documentation/api/extras/classes/ZendX_Db_Statement_Firebird.html +++ b/extras/documentation/api/extras/classes/ZendX_Db_Statement_Firebird.html @@ -407,7 +407,7 @@ statement object.
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_Db_Statement_Firebird_Exception.html b/extras/documentation/api/extras/classes/ZendX_Db_Statement_Firebird_Exception.html index 35025a32..6f741291 100644 --- a/extras/documentation/api/extras/classes/ZendX_Db_Statement_Firebird_Exception.html +++ b/extras/documentation/api/extras/classes/ZendX_Db_Statement_Firebird_Exception.html @@ -102,7 +102,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_Exception.html b/extras/documentation/api/extras/classes/ZendX_Exception.html index 443c642f..0b05650c 100644 --- a/extras/documentation/api/extras/classes/ZendX_Exception.html +++ b/extras/documentation/api/extras/classes/ZendX_Exception.html @@ -102,7 +102,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery.html b/extras/documentation/api/extras/classes/ZendX_JQuery.html index 70fa45df..8ab311bf 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery.html @@ -334,7 +334,7 @@ way the jQuery autogenerated code can be refactored based on personal needs. + generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Controller_Action_Helper_AutoComplete.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Controller_Action_Helper_AutoComplete.html index 105d24fc..a263ea4d 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Controller_Action_Helper_AutoComplete.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Controller_Action_Helper_AutoComplete.html @@ -131,7 +131,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Exception.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Exception.html index db20ff0e..849382b6 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Exception.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Exception.html @@ -94,7 +94,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form.html index 41def85b..b4f59b89 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form.html @@ -134,7 +134,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_AccordionContainer.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_AccordionContainer.html index feefd2a0..2ec623f8 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_AccordionContainer.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_AccordionContainer.html @@ -231,7 +231,7 @@ helper($element->getName(), $element->getValue(), $element->getAttribs(
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_AccordionPane.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_AccordionPane.html index bccb02e6..080a2bb7 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_AccordionPane.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_AccordionPane.html @@ -251,7 +251,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_DialogContainer.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_DialogContainer.html index 61561edb..24d71d3f 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_DialogContainer.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_DialogContainer.html @@ -258,7 +258,7 @@ helper($element->getName(), $element->getValue(), $element->getAttribs(
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_TabContainer.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_TabContainer.html index 4bf49eaa..43c6c36c 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_TabContainer.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_TabContainer.html @@ -231,7 +231,7 @@ helper($element->getName(), $element->getValue(), $element->getAttribs(
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_TabPane.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_TabPane.html index a60137e9..84b19b25 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_TabPane.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_TabPane.html @@ -251,7 +251,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetContainer.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetContainer.html index 6c93d8a9..758ace77 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetContainer.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetContainer.html @@ -210,7 +210,7 @@ helper($element->getName(), $element->getValue(), $element->getAttribs(
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetElement.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetElement.html index d5afe92f..57bb04b0 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetElement.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetElement.html @@ -245,7 +245,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetElementMarker.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetElementMarker.html index f528dc7a..cf843970 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetElementMarker.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetElementMarker.html @@ -86,7 +86,7 @@ without noticing that this is not possible.

+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetPane.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetPane.html index 02d656de..9049bb7d 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetPane.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Decorator_UiWidgetPane.html @@ -230,7 +230,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_AutoComplete.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_AutoComplete.html index eded1d1d..67794067 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_AutoComplete.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_AutoComplete.html @@ -270,7 +270,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_ColorPicker.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_ColorPicker.html index 15a91bf9..e03705cf 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_ColorPicker.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_ColorPicker.html @@ -270,7 +270,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_DatePicker.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_DatePicker.html index 9401fff2..cd6264fa 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_DatePicker.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_DatePicker.html @@ -270,7 +270,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_Slider.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_Slider.html index a9d95e5c..946c3450 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_Slider.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_Slider.html @@ -270,7 +270,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_Spinner.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_Spinner.html index 4f62c906..9541fc09 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_Spinner.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_Spinner.html @@ -270,7 +270,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_UiWidget.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_UiWidget.html index 1059d65e..f4ed42a8 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_UiWidget.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Element_UiWidget.html @@ -255,7 +255,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Exception.html b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Exception.html index b2e6a4ca..af1c1159 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Exception.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_Form_Exception.html @@ -90,7 +90,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Exception.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Exception.html index 7e74b06f..4f8fc67c 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Exception.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Exception.html @@ -98,7 +98,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AccordionContainer.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AccordionContainer.html index fd5c8c76..e89d656e 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AccordionContainer.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AccordionContainer.html @@ -318,7 +318,7 @@ for an accordion.

+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AccordionPane.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AccordionPane.html index ebf08356..70f76e11 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AccordionPane.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AccordionPane.html @@ -337,7 +337,7 @@ it possible to use \captureStart() and \captureEnd() methods.

+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AjaxLink.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AjaxLink.html index f6a6eed1..8af2485b 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AjaxLink.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AjaxLink.html @@ -223,7 +223,7 @@ subcontainer because of this single private class variable seems too much overhe
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AutoComplete.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AutoComplete.html index e7f2e7de..80780f27 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AutoComplete.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_AutoComplete.html @@ -218,7 +218,7 @@ see jQuery documentation.

+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_ColorPicker.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_ColorPicker.html index 1f852afc..d229e20a 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_ColorPicker.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_ColorPicker.html @@ -208,7 +208,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_DatePicker.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_DatePicker.html index b63c6305..0d8f17d8 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_DatePicker.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_DatePicker.html @@ -239,7 +239,7 @@ to be easily overriden.
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_DialogContainer.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_DialogContainer.html index f3ca2881..191d233c 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_DialogContainer.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_DialogContainer.html @@ -204,7 +204,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_JQuery.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_JQuery.html index d3ddeeff..681f7a87 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_JQuery.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_JQuery.html @@ -257,7 +257,7 @@ $j instead of $ to overcome conflicts.
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_JQuery_Container.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_JQuery_Container.html index 5845ea13..0a9b9170 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_JQuery_Container.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_JQuery_Container.html @@ -965,7 +965,7 @@ variable is null
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_Slider.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_Slider.html index 3ce89020..0d95c6dd 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_Slider.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_Slider.html @@ -267,7 +267,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_Spinner.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_Spinner.html index 7dc57287..a4308faf 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_Spinner.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_Spinner.html @@ -208,7 +208,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_TabContainer.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_TabContainer.html index 1c19c5ed..ae22bd14 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_TabContainer.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_TabContainer.html @@ -249,7 +249,7 @@ for chaining \addPane() for tab pane adding.

+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_TabPane.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_TabPane.html index 3ad2b4a3..601253eb 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_TabPane.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_TabPane.html @@ -339,7 +339,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_UiWidget.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_UiWidget.html index 8186e724..7fd772cb 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_UiWidget.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_UiWidget.html @@ -170,7 +170,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_UiWidgetPane.html b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_UiWidgetPane.html index 1760d4ed..de53b627 100644 --- a/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_UiWidgetPane.html +++ b/extras/documentation/api/extras/classes/ZendX_JQuery_View_Helper_UiWidgetPane.html @@ -278,7 +278,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/deprecated.html b/extras/documentation/api/extras/deprecated.html index 381377ca..6fe6a4a5 100644 --- a/extras/documentation/api/extras/deprecated.html +++ b/extras/documentation/api/extras/deprecated.html @@ -97,7 +97,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/errors.html b/extras/documentation/api/extras/errors.html index 2d7e8550..2e523b4f 100644 --- a/extras/documentation/api/extras/errors.html +++ b/extras/documentation/api/extras/errors.html @@ -543,7 +543,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/index.html b/extras/documentation/api/extras/index.html index f3cde7d3..c010fa6d 100644 --- a/extras/documentation/api/extras/index.html +++ b/extras/documentation/api/extras/index.html @@ -75,7 +75,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/markers.html b/extras/documentation/api/extras/markers.html index 254c67af..7cfa5b33 100644 --- a/extras/documentation/api/extras/markers.html +++ b/extras/documentation/api/extras/markers.html @@ -102,7 +102,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/namespaces/global.html b/extras/documentation/api/extras/namespaces/global.html index ea983323..762d4cd7 100644 --- a/extras/documentation/api/extras/namespaces/global.html +++ b/extras/documentation/api/extras/namespaces/global.html @@ -66,7 +66,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/Default.html b/extras/documentation/api/extras/packages/Default.html index 6a8fb757..a2d053b2 100644 --- a/extras/documentation/api/extras/packages/Default.html +++ b/extras/documentation/api/extras/packages/Default.html @@ -84,7 +84,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX.html b/extras/documentation/api/extras/packages/ZendX.html index 1ced5cb6..cd97cf42 100644 --- a/extras/documentation/api/extras/packages/ZendX.html +++ b/extras/documentation/api/extras/packages/ZendX.html @@ -84,7 +84,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX_Application.Resource.html b/extras/documentation/api/extras/packages/ZendX_Application.Resource.html index fc0984a8..ef7c1604 100644 --- a/extras/documentation/api/extras/packages/ZendX_Application.Resource.html +++ b/extras/documentation/api/extras/packages/ZendX_Application.Resource.html @@ -87,7 +87,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX_Application.html b/extras/documentation/api/extras/packages/ZendX_Application.html index da0307ea..b375da25 100644 --- a/extras/documentation/api/extras/packages/ZendX_Application.html +++ b/extras/documentation/api/extras/packages/ZendX_Application.html @@ -91,7 +91,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX_Console.html b/extras/documentation/api/extras/packages/ZendX_Console.html index 1a42bd9d..7059aeaf 100644 --- a/extras/documentation/api/extras/packages/ZendX_Console.html +++ b/extras/documentation/api/extras/packages/ZendX_Console.html @@ -100,7 +100,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX_Db.Adapter.html b/extras/documentation/api/extras/packages/ZendX_Db.Adapter.html index d5af3eef..b8c56977 100644 --- a/extras/documentation/api/extras/packages/ZendX_Db.Adapter.html +++ b/extras/documentation/api/extras/packages/ZendX_Db.Adapter.html @@ -95,7 +95,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX_Db.Statement.html b/extras/documentation/api/extras/packages/ZendX_Db.Statement.html index 6d21165e..39ee071b 100644 --- a/extras/documentation/api/extras/packages/ZendX_Db.Statement.html +++ b/extras/documentation/api/extras/packages/ZendX_Db.Statement.html @@ -95,7 +95,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX_Db.html b/extras/documentation/api/extras/packages/ZendX_Db.html index 3360adef..55678d18 100644 --- a/extras/documentation/api/extras/packages/ZendX_Db.html +++ b/extras/documentation/api/extras/packages/ZendX_Db.html @@ -127,7 +127,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX_JQuery.Form.html b/extras/documentation/api/extras/packages/ZendX_JQuery.Form.html index 2fb66009..f08dcb5f 100644 --- a/extras/documentation/api/extras/packages/ZendX_JQuery.Form.html +++ b/extras/documentation/api/extras/packages/ZendX_JQuery.Form.html @@ -199,7 +199,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX_JQuery.View.html b/extras/documentation/api/extras/packages/ZendX_JQuery.View.html index 6995b716..54d8b155 100644 --- a/extras/documentation/api/extras/packages/ZendX_JQuery.View.html +++ b/extras/documentation/api/extras/packages/ZendX_JQuery.View.html @@ -199,7 +199,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX_JQuery.html b/extras/documentation/api/extras/packages/ZendX_JQuery.html index dc15e8d0..3b04c686 100644 --- a/extras/documentation/api/extras/packages/ZendX_JQuery.html +++ b/extras/documentation/api/extras/packages/ZendX_JQuery.html @@ -355,7 +355,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/ZendX_Whois.html b/extras/documentation/api/extras/packages/ZendX_Whois.html index 46bbc2d8..5f4b3525 100644 --- a/extras/documentation/api/extras/packages/ZendX_Whois.html +++ b/extras/documentation/api/extras/packages/ZendX_Whois.html @@ -66,7 +66,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/api/extras/packages/global.html b/extras/documentation/api/extras/packages/global.html index 2babeb17..824d0f97 100644 --- a/extras/documentation/api/extras/packages/global.html +++ b/extras/documentation/api/extras/packages/global.html @@ -66,7 +66,7 @@
+ generated on 2016-09-08T10:35:38-05:00.
diff --git a/extras/documentation/manual/extras/en/index.html b/extras/documentation/manual/extras/en/index.html index d2049acd..957dd8e9 100644 --- a/extras/documentation/manual/extras/en/index.html +++ b/extras/documentation/manual/extras/en/index.html @@ -3,7 +3,7 @@ Programmer's Reference Guide - + @@ -30,7 +30,7 @@ Zend Technologies Inc. (http://www.zend.com)

-

2016-04-13

+

2016-09-08

diff --git a/extras/documentation/manual/extras/en/the.index.html b/extras/documentation/manual/extras/en/the.index.html index 52a401a8..36597176 100644 --- a/extras/documentation/manual/extras/en/the.index.html +++ b/extras/documentation/manual/extras/en/the.index.html @@ -3,7 +3,7 @@ Index - + @@ -24,7 +24,7 @@

Index

-
+
diff --git a/extras/documentation/manual/extras/en/zendx.console.process.unix.html b/extras/documentation/manual/extras/en/zendx.console.process.unix.html index 6f178e04..75b16faa 100644 --- a/extras/documentation/manual/extras/en/zendx.console.process.unix.html +++ b/extras/documentation/manual/extras/en/zendx.console.process.unix.html @@ -3,7 +3,7 @@ Chapter 1. ZendX_Console_Process_Unix - + diff --git a/extras/documentation/manual/extras/en/zendx.jquery.html b/extras/documentation/manual/extras/en/zendx.jquery.html index 59bbe68e..c25d7e42 100644 --- a/extras/documentation/manual/extras/en/zendx.jquery.html +++ b/extras/documentation/manual/extras/en/zendx.jquery.html @@ -3,7 +3,7 @@ Chapter 2. ZendX_JQuery - + diff --git a/library/Zend/Db/Select.php b/library/Zend/Db/Select.php index a2aa487a..d52dd3e9 100644 --- a/library/Zend/Db/Select.php +++ b/library/Zend/Db/Select.php @@ -81,7 +81,26 @@ class Zend_Db_Select const SQL_ASC = 'ASC'; const SQL_DESC = 'DESC'; - const REGEX_COLUMN_EXPR = '/^([\w]*\s*\(([^\(\)]|(?1))*\))$/'; + const REGEX_COLUMN_EXPR = '/^([\w]*\s*\(([^\(\)]|(?1))*\))$/'; + const REGEX_COLUMN_EXPR_ORDER = '/^([\w]+\s*\(([^\(\)]|(?1))*\))$/'; + const REGEX_COLUMN_EXPR_GROUP = '/^([\w]+\s*\(([^\(\)]|(?1))*\))$/'; + + // @see http://stackoverflow.com/a/13823184/2028814 + const REGEX_SQL_COMMENTS = '@ + (([\'"]).*?[^\\\]\2) # $1 : Skip single & double quoted expressions + |( # $3 : Match comments + (?:\#|--).*?$ # - Single line comments + | # - Multi line (nested) comments + /\* # . comment open marker + (?: [^/*] # . non comment-marker characters + |/(?!\*) # . ! not a comment open + |\*(?!/) # . ! not a comment close + |(?R) # . recursive case + )* # . repeat eventually + \*\/ # . comment close marker + )\s* # Trim after comments + |(?<=;)\s+ # Trim after semi-colon + @msx'; /** * Bind variables for query @@ -511,7 +530,9 @@ class Zend_Db_Select } foreach ($spec as $val) { - if (preg_match(self::REGEX_COLUMN_EXPR, (string) $val)) { + // Remove comments from SQL statement + $noComments = preg_replace(self::REGEX_SQL_COMMENTS, '$1', (string) $val); + if (preg_match(self::REGEX_COLUMN_EXPR_GROUP, $noComments)) { $val = new Zend_Db_Expr($val); } $this->_parts[self::GROUP][] = $val; @@ -603,7 +624,9 @@ class Zend_Db_Select $val = trim($matches[1]); $direction = $matches[2]; } - if (preg_match(self::REGEX_COLUMN_EXPR, (string) $val)) { + // Remove comments from SQL statement + $noComments = preg_replace(self::REGEX_SQL_COMMENTS, '$1', (string) $val); + if (preg_match(self::REGEX_COLUMN_EXPR_ORDER, $noComments)) { $val = new Zend_Db_Expr($val); } $this->_parts[self::ORDER][] = array($val, $direction); diff --git a/library/Zend/Version.php b/library/Zend/Version.php index 645ac0cc..0ee81c40 100644 --- a/library/Zend/Version.php +++ b/library/Zend/Version.php @@ -32,7 +32,7 @@ final class Zend_Version /** * Zend Framework version identification - see compareVersion() */ - const VERSION = '1.12.18'; + const VERSION = '1.12.20'; /** * The latest stable version Zend Framework available diff --git a/tests/Zend/Db/Select/StaticTest.php b/tests/Zend/Db/Select/StaticTest.php index b72a55d5..29f55d46 100644 --- a/tests/Zend/Db/Select/StaticTest.php +++ b/tests/Zend/Db/Select/StaticTest.php @@ -834,6 +834,14 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon $select = $this->_db->select(); $select->from(array('p' => 'products'))->order('MD5(1);drop table products; -- )'); $this->assertEquals('SELECT "p".* FROM "products" AS "p" ORDER BY "MD5(1);drop table products; -- )" ASC', $select->assemble()); + + $select = $this->_db->select(); + $select->from('p')->order("MD5(\";(\");DELETE FROM p2; SELECT 1 #)"); + $this->assertEquals('SELECT "p".* FROM "p" ORDER BY "MD5("";("");DELETE FROM p2; SELECT 1 #)" ASC', $select->assemble()); + + $select = $this->_db->select(); + $select->from('p')->order("MD5(\"a(\");DELETE FROM p2; #)"); + $this->assertEquals('SELECT "p".* FROM "p" ORDER BY "MD5(""a("");DELETE FROM p2; #)" ASC', $select->assemble()); } public function testSqlInjectionWithGroup() @@ -845,6 +853,14 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon $select = $this->_db->select(); $select->from(array('p' => 'products'))->group('MD5(1); drop table products; -- )'); $this->assertEquals('SELECT "p".* FROM "products" AS "p" GROUP BY "MD5(1); drop table products; -- )"', $select->assemble()); + + $select = $this->_db->select(); + $select->from('p')->group("MD5(\";(\");DELETE FROM p2; SELECT 1 #)"); + $this->assertEquals('SELECT "p".* FROM "p" GROUP BY "MD5("";("");DELETE FROM p2; SELECT 1 #)"', $select->assemble()); + + $select = $this->_db->select(); + $select->from('p')->group("MD5(\"a(\");DELETE FROM p2; #)"); + $this->assertEquals('SELECT "p".* FROM "p" GROUP BY "MD5(""a("");DELETE FROM p2; #)"', $select->assemble()); } public function testSqlInjectionInColumn()