Merge branch '1.3.3'

phalcon · Sep 22, 2014 · 9ce2bb0 · 9ce2bb0
2 parents bf9da26 + 65744c0
commit 9ce2bb0
Show file tree

Hide file tree

Showing 74 changed files with 4,792 additions and 1,657 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,6 @@ before_script:
 
 script:
  - ZEND_DONT_UNLOAD_MODULES=1 $(phpenv which php) ./unit-tests/ci/phpunit.php --debug -c unit-tests/phpunit.xml
- - ZEND_DONT_UNLOAD_MODULES=1 PHALCON_NO_RVO=1 $(phpenv which php) ./unit-tests/ci/phpunit.php --debug -c unit-tests/phpunit.xml
 
 after_failure:
  - sudo apt-get -qq install gdb

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+1.3.3
+ - Fix segmentation fault in zim_Phalcon_Http_Request_getBasicAuth (#2819)
+ - Fix memory corruption on unclean shutdown (#2829)
+
 1.3.2
  - fix inverted test in Model/setSnapshotData() (issue #2466)
  - Updated Phalcon\Queue\Beanstalk\Job::touch comment
@@ -66,6 +70,7 @@
  - #2018 add method \Phalcon\Db\Result\Pdo::nextRowset
  - Use phalcon_camelize for namesapce
  - #1932 Phalcon\Http\Request\File extend SplFileInfo
+>>>>>>> master
 
 1.3.1
  - Fixed segfault in Phalcon\Di\Service::resolve when string class does not exist (#2205)

diff --git a/build/32bits/config.m4 b/build/32bits/config.m4
@@ -1,4 +1,13 @@
 PHP_ARG_ENABLE(phalcon, whether to enable phalcon framework, [ --enable-phalcon   Enable phalcon framework])
+PHP_ARG_WITH(non-free, wheter to enable non-free css and js minifier, [ --without-non-free Disable non-free minifiers], yes, no)
+
+AC_MSG_CHECKING([Include non-free minifiers])
+if test "$PHP_NON_FREE" = "yes"; then
+	AC_DEFINE([PHALCON_NON_FREE], [1], [Whether non-free minifiers are available])
+	AC_MSG_RESULT([yes, css and js])
+else
+	AC_MSG_RESULT([no])
+fi
 
 if test "$PHP_PHALCON" = "yes"; then
 	AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon Framework])
@@ -37,23 +46,17 @@ if test "$PHP_PHALCON" = "yes"; then
 		[[#include "php_config.h"]]
 	)
 
-	AC_CHECK_DECL(
-		[HAVE_JSON],
+	AC_CHECK_HEADERS(
+		[ext/json/php_json.h],
 		[
-			AC_CHECK_HEADERS(
-				[ext/json/php_json.h],
-				[
-					PHP_ADD_EXTENSION_DEP([phalcon], [json])
-					AC_DEFINE([PHALCON_USE_PHP_JSON], [1], [Whether PHP json extension is present at compile time])
-				],
-				,
-				[[#include "main/php.h"]]
-			)
+			PHP_ADD_EXTENSION_DEP([phalcon], [json])
+			AC_DEFINE([PHALCON_USE_PHP_JSON], [1], [Whether PHP json extension is present at compile time])
 		],
 		,
-		[[#include "php_config.h"]]
+		[[#include "main/php.h"]]
 	)
 
+
 	AC_CHECK_DECL(
 		[HAVE_PHP_SESSION],
 		[
@@ -158,4 +161,4 @@ fi
 
 if test "$GCC" = "yes"; then
 	PHP_ADD_MAKEFILE_FRAGMENT([Makefile.frag.deps])
-fi
+fi