Merges changes from master

Author: AlexPeshkoff

.travis.yml

@@ -11,24 +11,24 @@ branches:
     - master
 
 install:
-  - wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.sh
-  - sudo sh cmake-3.2.3-Linux-x86_64.sh --skip-license --prefix=/usr
+  # wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.sh
+  # sudo sh cmake-3.2.3-Linux-x86_64.sh --skip-license --prefix=/usr
   - sudo apt-get update
   - sudo apt-get install -y libtommath0 libtommath-dev
-  - sudo python -m pip install Mako fdb
-  - svn co http://svn.code.sf.net/p/firebird/code/qa/fbtest/trunk/ fbtest
-  - svn co http://svn.code.sf.net/p/firebird/code/qa/fbt-repository/trunk/ fbtest/fbt
+  # sudo python -m pip install Mako fdb
+  # svn co http://svn.code.sf.net/p/firebird/code/qa/fbtest/trunk/ fbtest
+  # svn co http://svn.code.sf.net/p/firebird/code/qa/fbt-repository/trunk/ fbtest/fbt
 
 script:
-  - ./autogen.sh
-  - make -j2
-  - sudo echo `pwd`/gen/Release/firebird/lib | sudo tee --append /etc/ld.so.conf
-  - sudo ldconfig
-  - sudo ./gen/Release/firebird/bin/gsec -add sysdba -pw masterkey
-  - chmod 777 travis.sh
-  - sudo ./travis.sh start_server &
-  - ./travis.sh dummy_output &
-  - ./travis.sh skip_tests
-  - sleep 3
-  - cd fbtest/fbt
-  - python ../fbtest.py -d `pwd`/tmp -b `pwd`/../../gen/Release/firebird/bin -v -x -k ../../skip.txt
+  - ./autogen.sh --enable-binreloc --prefix=/opt/firebird
+  - make -j4
+  - make dist
+  - tar xzvf gen/Firebird-[0-9]*.tar.gz
+  - (cd Firebird-[0-9]*; sudo ./install.sh -silent)
+  - sudo usermod -a -G firebird travis
+  # sg firebird -c "/opt/firebird/bin/gsec -user sysdba -add sysdba -pw masterkey"
+  # ./travis.sh dummy_output &
+  # ./travis.sh skip_tests
+  # sleep 3
+  # cd fbtest/fbt
+  # sg firebird -c "python ../fbtest.py -d `pwd`/tmp -b /opt/firebird/bin -v -x -k ../../skip.txt"

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/FirebirdSQL/firebird.svg?branch=master)](https://travis-ci.org/FirebirdSQL/firebird)
+
 # Firebird README
 
 Firebird is a relational database offering many ANSI SQL standard features that runs on Linux, Windows, MacOS and a variety of Unix platforms. Firebird offers excellent concurrency, high performance, and powerful language support for stored procedures and triggers. It has been used in production systems, under a variety of names, since 1981.

builds/install/arch-specific/linux/firebird-classic.socket.in

@@ -5,6 +5,7 @@ Conflicts=firebird-superserver.service
 [Socket]
 ListenStream=3050
 Accept=true
+MaxConnections=2048
 
 [Install]
 WantedBy=sockets.target

builds/install/misc/firebird.conf.in

@@ -483,8 +483,8 @@
 # database feature for encrypted database. In that case special care should be
 # taken to encrypt that key before passing it to server using callback. Make
 # sure your keys are well encrypted before enabling this parameter. Take into
-# account that with CryptSecurityDatabase=TRUE unencrypted by firebird protocol
-# key transfer may take place even with not encrypted security database.
+# account that with AllowEncryptedSecurityDatabase=TRUE unencrypted by firebird
+# protocol key transfer may take place even with not encrypted security database.
 # This feature is not supported by legacy authentication plugin - if you care
 # about security please never use legacy authentication.
 #
@@ -496,7 +496,7 @@
 # Please understand what are you doing before enabling this feature !!! #
 #########################################################################
 #
-#CryptSecurityDatabase = false
+#AllowEncryptedSecurityDatabase = false
 
 # ----------------------------
 #
@@ -526,6 +526,30 @@
 #DeadlockTimeout = 10
 
 
+# ----------------------------
+#
+# Set number of seconds after which statement execution will be automatically
+# cancelled by the engine. Zero means no timeout is set.
+#
+# Per-database configurable.
+#
+# Type: integer
+#
+#StatementTimeout = 0
+
+
+# ----------------------------
+#
+# Set number of minutes after which idle attachment will be disconnected by the
+# engine. Zero means no timeout is set.
+#
+# Per-database configurable.
+#
+# Type: integer
+#
+#ConnectionIdleTimeout = 0
+
+
 # ----------------------------
 #
 # How often the pages are flushed on disk

builds/make.new/config/.gitignore

@@ -1,4 +1,4 @@
 config.guess
-config.h.in
+config.h.in*
 config.sub
 ltmain.sh

builds/posix/firebird.vers

@@ -347,6 +347,7 @@ fb_get_database_handle
 fb_get_transaction_handle
 
 fb_database_crypt_callback
+fb_dsql_set_timeout
 
 # Other misc functions
 

builds/win32/defs/firebird.def

@@ -222,6 +222,7 @@ EXPORTS
 	isc_dsql_release	@199
 	isc_dsql_set_cursor_name	@200
 	isc_dsql_sql_info	@201
+	fb_dsql_set_timeout
 
 	; ESQL functions
 

doc/README.session_idle_timeouts

@@ -0,0 +1,113 @@
+  Timeouts for idle database sessions.
+  
+Author:
+  Vlad Khorsun <[email protected]>
+
+
+Description:
+
+  The feature allows to automatically close user connection after period of inactivity.
+It could be used by database administrators to forcibly close old inactive connections
+and free resources it occupies. Application and tools developers also could find it as 
+easy replacement of self-made control for the connection life time. 
+  It is recommended (but not required) to set idle timeout to reasonable big value, such 
+as few hours. By default it is not enabled.
+
+  The feature works as below
+- when user API call leaves engine, special idle timer assotiated with current connection 
+  is started
+- when user API call enters engine, idle timer is stopped
+- when idle time is fired engine immediately closes the connection in the same way as 
+  with asyncronous connection cancellation:
+  - all active statements and cursors are closed
+  - all active transactions are rolled back
+  - network connection is not closed at this moment. It allows client application to get 
+    exact error code on next API call. Network connection will be closed by the server 
+	side after error is reported or due to network timeout if client side disconnects. 
+- idle session timeout could be set:
+  - at database level, by setting value in firebird.conf (or databases.conf) by database 
+    administrator
+    scope - all user connections, except of system connections (garbage collector, cache 
+		writer, etc)
+	units - minutes
+  - at connection level, using API and\or new SQL statement (see below)
+    scope - given connection
+	units - up to seconds
+- effective value of idle timeout is evaluated every time user API call leaves the engine
+  as:
+  - if not set at connection level, look at database level
+  - in any case can't be greater than value set at database level 
+  i.e. value of idle timeout could be overriden by application developer at given 
+  connection but it can't relax limit set by DBA (in config)
+- zero timeout means no timeout, i.e. idle timer will not start
+- while idle timeout is set in seconds at API level, we can't promise absolute precision. 
+  With high load it could be less precise. The only guarantee is that timeout will not 
+  fire before specified moment.
+- if connection was cancelled, next user API call returns error isc_att_shutdown with 
+  secondary error code specifying exact reason:
+  isc_att_shut_killed:		Killed by database administrator
+  isc_att_shut_idle:		Idle timeout expired
+  isc_att_shut_db_down:		Database is shutdown
+  isc_att_shut_engine:		Engine is shutdown
+
+  
+  Support at configuration level (firebird.conf and\or databases.conf)
+ 
+  New setting "ConnectionIdleTimeout": set number of minutes after which idle connection 
+will be disconnected by the engine. Zero means no timeout is set.
+Per-database configurable. Type: integer. Default value is 0.
+
+  
+  Support at API level
+  
+- get\set idle connection timeout, seconds
+interface Attachment 
+	uint getIdleTimeout(Status status);
+	void setIdleTimeout(Status status, uint timeOut);
+
+- get idle connection timeout at config and\or connection level is possible
+  using isc_database_info() API with new info tags:
+  - fb_info_ses_idle_timeout_db			value set at config level
+  - fb_info_ses_idle_timeout_att		value set at given connection level
+  - fb_info_ses_idle_timeout_run		actual timeout value for given connection
+										evaluated considering values set at config and 
+										connection levels, see "effective value of idle 
+										timeout" above
+
+Remote client implementation notes:
+  - Attachment::setIdleTimeout() issued "SET SESSION IDLE TIMEOUT" SQL statement
+  - Attachment::getIdleTimeout() calls isc_database_info() with 
+    fb_info_ses_idle_timeout_att tag 
+
+If remote server doesn't support idle connection timeouts (protocol version less than 16):
+  - Attachment::setIdleTimeout() will return isc_wish_list error
+  - Attachment::getIdleTimeout() will return zero and set isc_wish_list error 
+  - isc_database_info() will return isc_info_error tag in info buffer (as usual).
+
+
+  Support in SQL
+
+- New SQL statement allows to set idle connection timeout at connection level:
+
+	SET SESSION IDLE TIMEOUT <value> [HOUR | MINUTE | SECOND]
+
+if timepart is not set, default is MINUTE.
+This statement could run outside of transaction control and immediately effective.
+
+- Context variables
+
+  Context 'SYSTEM' have new variable: 'SESSION_IDLE_TIMEOUT'. It contains current value 
+of idle connection timeout that was set at connection level, or zero, if timeout was not
+set.
+
+- Monitoring tables
+
+  MON$ATTACHMENTS
+    MON$IDLE_TIMEOUT		Connection level idle timeout
+	MON$IDLE_TIMER			Idle timer expiration time
+
+  MON$IDLE_TIMEOUT contains timeout value set at connection level, in seconds. Zero, if 
+	timeout is not set.
+
+  MON$IDLE_TIMER contains NULL value if idle timeout was not set or if timer is not 
+	running.