clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,653 Commits 494 Branches 1,367 Tags 813 MiB
7032e1b96d
Commit Graph

57 Commits

Author SHA1 Message Date
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Christopher Jones
6c20b07190 OCI8: fix prototypes for oci_field_*(). They can take a column index or name. 2014-03-19 15:20:40 -07:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Christopher Jones
12f9939b79 Bump mininum requirements for PHP OCI8 2.0 to PHP 5.2 and Oracle 
client library 10.2 (Note this will connect to Oracle Database 8.1.7
onwards). Use the older OCI8 1.4 from PECL if using an earlier PHP
version or older Oracle client library support is necessary.
 2013-10-07 17:23:11 -07:00
Christopher Jones
954a0f8bf4 OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c. 
Currently this code is #ifdef'd out, since I can't consider the feature stable until an Oracle-side fix for Oracle bug 16695981 is available.  Having the code available in PHP OCI8 facilitates testing of any fix.
 2013-09-30 16:51:07 -07:00
Christopher Jones
9b9eaba083 OCI8: Fix alloc function and DLL generation 2013-09-27 17:00:41 -07:00
Christopher Jones
5ac7c533a0 More OCI8 DTrace probe updates. 
Change php.ini-* doc to match an earlier change to config.w32
 2013-09-26 21:12:11 -07:00
Christopher Jones
43289d664c Remove obsolete flag 2013-09-06 10:12:16 -07:00
Christopher Jones
4b778faa80 Make oci_set_*($connection,...) errors retrievable via oci_error($connection). 
Improve some error handling to produce error text on some rare edge cases.
Disambiguate the Oracle library function call return status values from ORA error numbers.
Review and unify error data types.
 2013-09-05 18:18:29 -07:00
Christopher Jones
8aca4e45bb Leave it to DTrace FBT to trace underlying library calls 2013-08-26 14:20:58 -07:00
Christopher Jones
85b66e9e21 OCI8 extension: Allow Implicit Result Set statement resources to inherit the parent's current prefetch count 2013-07-26 13:34:45 -07:00
Christopher Jones
586fc4909e Fix --enable-maintainer-zts mode in OCI8 2.0 2013-07-25 16:15:32 -07:00
Christopher Jones
bfc3c223da Initial PHP OCI8 2.0.0-dev commit. 
Includes Oracle Database 12c Implicit Result Set support, DTrace
support, and various code cleanups.

See package.xml for details.
 2013-07-24 15:33:22 -07:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Christopher Jones
16b744d2d4 Add oci_client_version() returning the runtime Oracle client library version - predominantly useful for the test suite 2011-06-10 17:38:07 +00:00
Christopher Jones
c287e682f2 Sync OCI8 branches. Allow 'pecl install' to work on both PHP 5.3 & 5.4 2011-06-07 23:53:02 +00:00
Felipe Pena
4737910b69 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Christopher Jones
314c9b9233 Protect against null bytes in LOB filenames (rasmus) 2010-11-16 19:33:31 +00:00
Christopher Jones
b2b1a53031 Fixed bug #53284 (Valgrind warnings in oci_set_* functions) 2010-11-10 18:49:55 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Christopher Jones
5e8e34bac8 Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown) 
- Improved descriptor refcounting to remove unneeded items sooner
 - Replaced n^2 list traversal during descriptor list destruction
 2010-01-06 18:58:16 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Christopher Jones
2769ae0444 1. Introduce connection attribute functions: 
oci_set_module_name
         oci_set_action
         oci_set_client_info
         oci_set_client_identifier
      
       These functions set values that are visible and used by the
       database.  They aid tracing, authentication and auditing.

    2. Introduce connection attribute function:

         oci_set_edition

       Oracle 11g R2 "editions" allow multiple versions of DB objects
       to exist at one time.  By setting different editions, two
       different versions of an application can run concurrently,
       making upgrades or A/B testing easier.

    3. Introduce OCI_NO_AUTO_COMMIT as an alias for the OCI_DEFAULT
       constant (which is not the default value) used by oci_execute().

    4. Allow the oci_set_prefetch value to be 0.  This is important in
       some cases using REF CURSORS in Oracle 11gR2.

    5. Set the DRIVER_NAME attribute of Oracle Database 11gR2
       connections to aid application tracing.  The value used is to
       "PHP OCI8" followed by the OCI8 version number.  Note the
       version number may get truncated in DB views such as
       v$session_connect_info.

    6. Generate an error if an invalid resource type is used in
       oci_bind_by_name

[DOC] Documentation will be added for the changes
 2009-10-06 22:36:32 +00:00
Christopher Jones
8fca6e46eb Eliminate type warnings. This change is not needed in other branches 2009-10-01 06:06:41 +00:00
Christopher Jones
f346405330 MFH: Use PHP 5 function name in error message 2009-03-09 20:20:07 +00:00
Christopher Jones
8cf010352c Tweak fix for #45458 to allow this branch (from PECL) to continue building with PHP 4 et al. No other branches need changing 2009-02-05 21:43:31 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Christopher Jones
c5aa4a138e MFH: Bug #45458 (OCI8: Numeric keys for associative arrays are not handled properly) 2008-08-28 06:19:45 +00:00
Christopher Jones
b8e1d4d4e5 MFB: OCI8: Remove macros obsoleted by rev 1.55.2.3.2.11.2.1 when Oracle 8 support was dropped 2008-06-05 23:43:10 +00:00
Christopher Jones
08eaa56798 MFH 
Code:
  - Do scope-end release for oci_pconnect (oci8.old_oci_close_semantics=1 gives old behavior)
  - Fix session reuse with 10.2 client libs
  - Fix the Ping macro version check for 10.2
  - Add type check associated with zend_list_find
  - Code connection re-organized for reuse
  - Format comments
  - WS changes
  - Prepare for new PECL release
Tests:
  - Add new tests
  - Rationalize password tests
  - Revert use of __DIR__ so tests will work with PHP 5.2
  - Update some skipifs to make tests more portable
 2008-04-18 00:05:27 +00:00
Antony Dovgal
aa555ca0a9 MFH 2008-04-02 14:56:21 +00:00
Christopher Jones
ceb2193b7c rename PHP_OCI8_VERSION in preparation for peclversioning RFC. Remove obsolete HAVE_OCI8_ATTR_STATEMENT macro 2008-03-25 02:00:32 +00:00
Christopher Jones
b4b099ae19 MFH: OCI8: fix bug #44008 (OCI-Lob->close) & bug #44206 (ref cursor leak) 2008-02-25 23:50:51 +00:00
Christopher Jones
87dcb8df8e Merge DRCP & FAN support. PHP6 sync will happen later 2008-01-31 01:33:30 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Christopher Jones
f894c6ece7 MFH: Bug #42173 (INTERVAL and TIMESTAMP type fixes) 2007-08-02 19:04:37 +00:00
Antony Dovgal
287ac21d5f MFH: missing part of the fix for bug #42134 2007-07-31 21:09:01 +00:00
Antony Dovgal
9efa1d8914 MFH: fix #42134 (oci_error() returns false after oci_new_collection() fails) 2007-07-31 19:21:08 +00:00
Christopher Jones
d2219c0a1a MFH: add casts to fix compilation warnings 2007-07-18 15:10:42 +00:00
Antony Dovgal
f361d9e4f0 MFH: fix #39988 (type argument of oci_define_by_name() is ignored) 
patch and tests by Chris Jones
 2007-01-11 12:01:08 +00:00
Antony Dovgal
7cf0e005fa MFH 2007-01-03 20:45:22 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Antony Dovgal
ed11386c3d MFH 2006-12-21 22:08:26 +00:00
Antony Dovgal
ab765ca497 MFH 2006-12-11 12:34:09 +00:00
Antony Dovgal
88e827f3f1 MFH 2006-11-10 23:03:32 +00:00
Antony Dovgal
08a9ab02ba minor improvements 2006-08-22 11:09:12 +00:00
Antony Dovgal
aa1ced04cb MFH: fix #38173 (Freeing nested cursors causes OCI8 to segfault) 2006-07-30 20:51:24 +00:00