Release v5.1.2

swoole · Jan 24, 2024 · 25a31f2 · 25a31f2
1 parent e7ffef2
commit 25a31f2
Show file tree

Hide file tree

Showing 106 changed files with 201 additions and 121 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(libswoole)
 
 ENABLE_LANGUAGE(ASM)
-set(SWOOLE_VERSION 5.1.1)
+set(SWOOLE_VERSION 5.1.2)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")

diff --git a/ext-src/php_swoole.cc b/ext-src/php_swoole.cc
@@ -570,6 +570,7 @@ PHP_MINIT_FUNCTION(swoole) {
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_HTTP_PROXY_HANDSHAKE_FAILED", SW_ERROR_HTTP_PROXY_HANDSHAKE_FAILED);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_HTTP_PROXY_BAD_RESPONSE", SW_ERROR_HTTP_PROXY_BAD_RESPONSE);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_HTTP_CONFLICT_HEADER", SW_ERROR_HTTP_CONFLICT_HEADER);
+    SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_HTTP_CONTEXT_UNAVAILABLE", SW_ERROR_HTTP_CONTEXT_UNAVAILABLE);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_WEBSOCKET_BAD_CLIENT", SW_ERROR_WEBSOCKET_BAD_CLIENT);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_WEBSOCKET_BAD_OPCODE", SW_ERROR_WEBSOCKET_BAD_OPCODE);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_WEBSOCKET_UNCONNECTED", SW_ERROR_WEBSOCKET_UNCONNECTED);
@@ -651,6 +652,7 @@ PHP_MINIT_FUNCTION(swoole) {
     SW_REGISTER_LONG_CONSTANT("SWOOLE_TRACE_CO_PGSQL", SW_TRACE_CO_PGSQL);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_TRACE_CO_ODBC", SW_TRACE_CO_ODBC);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_TRACE_CO_ORACLE", SW_TRACE_CO_ORACLE);
+    SW_REGISTER_LONG_CONSTANT("SWOOLE_TRACE_CO_SQLITE", SW_TRACE_CO_SQLITE);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_TRACE_ALL", SW_TRACE_ALL);
 
     /**

diff --git a/ext-src/php_swoole_library.h b/ext-src/php_swoole_library.h
@@ -14,11 +14,13 @@
   +----------------------------------------------------------------------+
  */
 
-/* $Id: 2ff30e0a106505dd57c838de88af0254500e7ce5 */
+/* $Id: 9504fec3ee5e8583aba99cf524a73b6f1b316d14 */
 
 #ifndef SWOOLE_LIBRARY_H
 #define SWOOLE_LIBRARY_H
 
+#include "zend_exceptions.h"
+
 #if PHP_VERSION_ID < 80000
 typedef zval zend_source_string_t;
 #else
@@ -369,8 +371,6 @@ static const char* swoole_library_source_core_constant =
     "\n"
     "    public const OPTION_DNS_CACHE_CAPACITY = 'dns_cache_capacity';\n"
     "\n"
-    "    public const OPTION_MAX_CONCURRENCY = 'max_concurrency';\n"
-    "\n"
     "    public const OPTION_CONNECT_TIMEOUT = 'connect_timeout';\n"
     "\n"
     "    public const OPTION_TIMEOUT = 'timeout';\n"
@@ -391,6 +391,8 @@ static const char* swoole_library_source_core_constant =
     "\n"
     "    public const OPTION_WEBSOCKET_COMPRESSION = 'websocket_compression';\n"
     "\n"
+    "    public const OPTION_WRITE_FUNC = 'write_func';\n"
+    "\n"
     "    public const OPTION_HTTP_PARSE_COOKIE = 'http_parse_cookie';\n"
     "\n"
     "    public const OPTION_HTTP_PARSE_POST = 'http_parse_post';\n"
@@ -459,6 +461,8 @@ static const char* swoole_library_source_core_constant =
     "\n"
     "    public const OPTION_MAX_QUEUED_BYTES = 'max_queued_bytes';\n"
     "\n"
+    "    public const OPTION_MAX_CONCURRENCY = 'max_concurrency';\n"
+    "\n"
     "    public const OPTION_WORKER_MAX_CONCURRENCY = 'worker_max_concurrency';\n"
     "\n"
     "    public const OPTION_SEND_TIMEOUT = 'send_timeout';\n"
@@ -9727,7 +9731,7 @@ static const char* swoole_library_source_alias_ns =
     "    }\n"
     "}\n";
 
-void php_swoole_load_library()
+void php_swoole_load_library(void)
 {
     _eval(swoole_library_source_constants, "@swoole/library/constants.php");
     _eval(swoole_library_source_std_exec, "@swoole/library/std/exec.php");

diff --git a/include/swoole_version.h b/include/swoole_version.h
@@ -20,10 +20,10 @@
 
 #define SWOOLE_MAJOR_VERSION 5
 #define SWOOLE_MINOR_VERSION 1
-#define SWOOLE_RELEASE_VERSION 1
+#define SWOOLE_RELEASE_VERSION 2
 #define SWOOLE_EXTRA_VERSION ""
-#define SWOOLE_VERSION "5.1.1"
-#define SWOOLE_VERSION_ID 50101
+#define SWOOLE_VERSION "5.1.2"
+#define SWOOLE_VERSION_ID 50102
 #define SWOOLE_API_VERSION_ID 0x202208a
 
 #define SWOOLE_BUG_REPORT                                                                                              \

diff --git a/package.xml b/package.xml
@@ -51,8 +51,8 @@
         <email>doubaokun@php.net</email>
         <active>yes</active>
     </developer>
-    <date>2023-11-26</date>
-    <time>23:00:00</time>
+    <date>2024-01-24</date>
+    <time>12:00:00</time>
     <version>
         <release>5.1.1</release>
         <api>5.0</api>
@@ -63,15 +63,15 @@
     </stability>
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
     <notes>
-        - Fixed memory leak issue in HTTP coroutine client
-        - Fixed the issue of can not hook pdo_odbc
-        - Fixed the error in executing socket_import_stream()
-        - Fixed the issue with Context::parse_multipart_data() unable to handle empty request body
-        - Fixed the issue with PostgreSQL coroutine client where the parameters are not working
-        - Fixed the bug where curl crashes during destruction
-        - Fixed the compatibility issue between Swoole 5.x and the latest version of xdebug
-        - Fixed the problem of class not found error caused by coroutine switching during the process of class autoloading
-        - Fixed the issue of not being able to compile Swoole on OpenBSD
+        - Added support for embed sapi @matyhtf
+        - Fixed compatibility with PHP 8.3 ZEND_CHECK_STACK_LIMIT @Yurunsoft
+        - Fixed no Content-Range response header when the range request returns all the contents of the file @Yurunsoft
+        - Optimized HTTP server performance @NathanFreeman
+        - Fixed truncated cookie @stnguyen90
+        - Fixed native-curl crash on PHP 8.3 @NathanFreeman
+        - Added CLOSE_SERVICE_RESTART, CLOSE_TRY_AGAIN_LATER, CLOSE_BAD_GATEWAY as valid close reasons for websocket @cjavad
+        - Fixed invalid errno after Server::Manager::wait() @JacobBrownAustin
+        - Fixed HTTP2 Typo @@leocavalcante
     </notes>
     <contents>
         <dir name="/">
@@ -492,6 +492,7 @@
             <file role="doc" name="examples/www/index.html" />
             <file role="doc" name="examples/www/index.txt" />
             <file role="src" name="ext-src/php_swoole.cc" />
+            <file role="src" name="ext-src/php_swoole_call_stack.h" />
             <file role="src" name="ext-src/php_swoole_client.h" />
             <file role="src" name="ext-src/php_swoole_coroutine.h" />
             <file role="src" name="ext-src/php_swoole_coroutine_system.h" />
@@ -2522,6 +2523,8 @@
             <file role="src" name="thirdparty/php81/pdo_sqlite/sqlite_driver.stub.php" />
             <file role="src" name="thirdparty/php81/pdo_sqlite/sqlite_driver_arginfo.h" />
             <file role="src" name="thirdparty/php81/pdo_sqlite/sqlite_statement.c" />
+            <file role="src" name="thirdparty/php83/Zend/zend_call_stack.cc" />
+            <file role="src" name="thirdparty/php83/Zend/zend_call_stack.h" />
             <file role="src" name="thirdparty/swoole_http_parser.c" />
             <file role="src" name="thirdparty/swoole_http_parser.h" />
             <file role="src" name="tools/analysis.php" />
@@ -2530,7 +2533,6 @@
             <file role="src" name="tools/build-library.php" />
             <file role="src" name="tools/code-generator.php" />
             <file role="src" name="tools/composer.json" />
-            <file role="src" name="tools/config-generator.php" />
             <file role="src" name="tools/constant-generator.php" />
             <file role="src" name="tools/export.php" />
             <file role="src" name="tools/gen-data.php" />

diff --git a/src/core/error.cc b/src/core/error.cc
@@ -166,6 +166,8 @@ const char *swoole_strerror(int code) {
         return "Http proxy bad response";
     case SW_ERROR_HTTP_CONFLICT_HEADER:
         return "Http conflict header";
+    case SW_ERROR_HTTP_CONTEXT_UNAVAILABLE:
+        return "Http context unavailable";
     case SW_ERROR_WEBSOCKET_BAD_CLIENT:
         return "Websocket bad client";
     case SW_ERROR_WEBSOCKET_BAD_OPCODE:

diff --git a/tests/swoole_http_server/bug_5146.phpt b/tests/swoole_http_server/bug_5146.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_http_response: Github#5146 HTTP服务器，添加响应cookie时，如果设置了过期时间会内存泄漏
+swoole_http_server: Github#5146 HTTP服务器，添加响应cookie时，如果设置了过期时间会内存泄漏
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_pdo_odbc/blocking.phpt b/tests/swoole_pdo_odbc/blocking.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_pdo_pgsql: test hook pgsql
+swoole_pdo_odbc: test hook pgsql
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_pdo_odbc/query.phpt b/tests/swoole_pdo_odbc/query.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_pdo_pgsql: test query
+swoole_pdo_odbc: test query
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_pdo_odbc/race.phpt b/tests/swoole_pdo_odbc/race.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_pdo_pgsql: race
+swoole_pdo_odbc: race
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_pdo_odbc/server_info.phpt b/tests/swoole_pdo_odbc/server_info.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_pdo_pgsql: test hook pgsql
+swoole_pdo_odbc: test hook pgsql
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc';
 skip_if_php_version_lower_than('8.1');

diff --git a/tests/swoole_pdo_odbc/sleep.phpt b/tests/swoole_pdo_odbc/sleep.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_pdo_pgsql: test hook pgsql
+swoole_pdo_odbc: test hook pgsql
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_pdo_odbc/transaction.phpt b/tests/swoole_pdo_odbc/transaction.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_pdo_pgsql: test query
+swoole_pdo_odbc: test query
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_pdo_oracle/bug41996.phpt b/tests/swoole_pdo_oracle/bug41996.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO OCI Bug #41996 (Problem accessing Oracle ROWID)
+swoole_pdo_oracle: PDO OCI Bug #41996 (Problem accessing Oracle ROWID)
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/bug44301.phpt b/tests/swoole_pdo_oracle/bug44301.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO OCI Bug #44301 (Segfault when an exception is thrown on persistent connections)
+swoole_pdo_oracle: PDO OCI Bug #44301 (Segfault when an exception is thrown on persistent connections)
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/bug46274.phpt b/tests/swoole_pdo_oracle/bug46274.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #46274 (pdo_pgsql - Segfault when using PDO::ATTR_STRINGIFY_FETCHES and blob)
+swoole_pdo_oracle:ATTR_STRINGIFY_FETCHES and blob)
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/bug46274_2.phpt b/tests/swoole_pdo_oracle/bug46274_2.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #46274 (pdo_oci - Segfault when using PDO::ATTR_STRINGIFY_FETCHES and blob)
+swoole_pdo_oracle:ATTR_STRINGIFY_FETCHES and blob)
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/bug54379.phpt b/tests/swoole_pdo_oracle/bug54379.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #54379 (PDO_OCI: UTF-8 output gets truncated)
+swoole_pdo_oracle: UTF-8 output gets truncated)
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/bug57702.phpt b/tests/swoole_pdo_oracle/bug57702.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO OCI Bug #57702 (Multi-row BLOB fetches)
+swoole_pdo_oracle: PDO OCI Bug #57702 (Multi-row BLOB fetches)
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/bug60994.phpt b/tests/swoole_pdo_oracle/bug60994.phpt
@@ -1,5 +1,5 @@
 --TEST--
-PDO OCI Bug #60994 (Reading a multibyte CLOB caps at 8192 characters)
+swoole_pdo_oracle: PDO OCI Bug #60994 (Reading a multibyte CLOB caps at 8192 characters)
 --SKIPIF--
 <?php
 if (PHP_VERSION < 80100) {

diff --git a/tests/swoole_pdo_oracle/bug_33707.phpt b/tests/swoole_pdo_oracle/bug_33707.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO OCI Bug #33707 (Errors in select statements not reported)
+swoole_pdo_oracle: PDO OCI Bug #33707 (Errors in select statements not reported)
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/checkliveness.phpt b/tests/swoole_pdo_oracle/checkliveness.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO OCI checkliveness (code coverage)
+swoole_pdo_oracle: PDO OCI checkliveness (code coverage)
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/coroutint.phpt b/tests/swoole_pdo_oracle/coroutint.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO OCI coroutine
+swoole_pdo_oracle: PDO OCI coroutine
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/oci_success_with_info.phpt b/tests/swoole_pdo_oracle/oci_success_with_info.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Handling OCI_SUCCESS_WITH_INFO
+swoole_pdo_oracle: Handling OCI_SUCCESS_WITH_INFO
 --SKIPIF--
 <?php
 if (PHP_VERSION < 80100) {

diff --git a/tests/swoole_pdo_oracle/pdo_oci_attr_action.phpt b/tests/swoole_pdo_oracle/pdo_oci_attr_action.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO_OCI: Attribute: Setting session action
+swoole_pdo_oracle: Setting session action
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/pdo_oci_attr_autocommit_1.phpt b/tests/swoole_pdo_oracle/pdo_oci_attr_autocommit_1.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO_OCI: Attribute: Basic autocommit functionality
+swoole_pdo_oracle: Basic autocommit functionality
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/pdo_oci_attr_autocommit_2.phpt b/tests/swoole_pdo_oracle/pdo_oci_attr_autocommit_2.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO_OCI: Attribute: beginTransaction and native transactions
+swoole_pdo_oracle: beginTransaction and native transactions
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/pdo_oci_attr_autocommit_3.phpt b/tests/swoole_pdo_oracle/pdo_oci_attr_autocommit_3.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO_OCI: Attribute: closing a connection in non-autocommit mode commits data
+swoole_pdo_oracle: closing a connection in non-autocommit mode commits data
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/pdo_oci_attr_call_timeout.phpt b/tests/swoole_pdo_oracle/pdo_oci_attr_call_timeout.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO_OCI: Attribute: Setting and using call timeout
+swoole_pdo_oracle: Setting and using call timeout
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
 require __DIR__ . '/../include/bootstrap.php';

diff --git a/tests/swoole_pdo_oracle/pdo_oci_attr_case.phpt b/tests/swoole_pdo_oracle/pdo_oci_attr_case.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO_OCI: Attribute: Column Case
+swoole_pdo_oracle: Column Case
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/pdo_oci_attr_client.phpt b/tests/swoole_pdo_oracle/pdo_oci_attr_client.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO_OCI: Attribute: Client version
+swoole_pdo_oracle: Client version
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/pdo_oci_attr_client_identifier.phpt b/tests/swoole_pdo_oracle/pdo_oci_attr_client_identifier.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO_OCI: Attribute: Setting session client identifier
+swoole_pdo_oracle: Setting session client identifier
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/pdo_oci_attr_client_info.phpt b/tests/swoole_pdo_oracle/pdo_oci_attr_client_info.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO_OCI: Attribute: Setting session client info
+swoole_pdo_oracle: Setting session client info
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';

diff --git a/tests/swoole_pdo_oracle/pdo_oci_attr_drivername.phpt b/tests/swoole_pdo_oracle/pdo_oci_attr_drivername.phpt
@@ -1,6 +1,7 @@
 --TEST--
-PDO_OCI: Attribute: verify driver name
+swoole_pdo_oracle: verify driver name
 --SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 require __DIR__ . '/pdo_oracle.inc';