Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  made the apache ini holders to be zend_bool
  Removed useless local variable
  Use simpler functions
  Fixed test
  small fixes to UPGRADING
  Reorder to save alignment size (of course, only for common used structs)

1 files changed, 3 insertions, 3 deletions

diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h
index da20072b14..8712b2b958 100644
--- a/sapi/apache2handler/php_apache.h
+++ b/sapi/apache2handler/php_apache.h
@@ -70,9 +70,9 @@ void php_ap2_register_hook(apr_pool_t *p);
 #define APR_ARRAY_FOREACH_CLOSE() }}
 
 typedef struct {
-	long engine;
-	long xbithack;
-	long last_modified;
+	zend_bool engine;
+	zend_bool xbithack;
+	zend_bool last_modified;
 } php_apache2_info_struct;
 
 extern zend_module_entry apache2_module_entry;