Commit Graph

836 Commits

Author SHA1 Message Date
Anatol Belski
4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
Nikita Popov
e33f3d3b7c Move smart_str implementation into Zend/
So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
2014-09-21 20:49:39 +02:00
Florian MARGAINE
8eb7e7bf7f Merge branch 'master' into issue-67910
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Nikita Popov
37aaccad7d Use inline functions for most of smart_str
smart_str_free_ex no longer exists, always use smart_str_free instead.

smart_str_alloc no longer requires a newlen variable to be in scope,
instead it returns the new length.
2014-09-19 23:39:07 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
466a4c97b2 replace zend_hash_find with zend_hash_str_find which fixes leaking the key 2014-09-10 13:22:23 +02:00
Anatol Belski
e3ded277a5 second big shot on porting ext/oci8
still a lot to do, but most raw things done
2014-09-10 12:41:43 +02:00
Anatol Belski
686213a242 first shot on fixing ext/oci8 2014-09-10 12:41:42 +02:00
Anatol Belski
2e085df5c0 basic datatype fixes for ext/oci8 2014-09-10 12:41:41 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
b108267f2c Merge branch 'master' into phpng
* master: (41 commits)
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
  Fix patch for bug #67436
  fix failed test
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
  Added tests for bug 67436
  Fixed wrong XFAIL test - already fixed
  Fix typo in Bug #67406 NEWS entry
  Fix typo in Bug #67406 NEWS entry
  ...

Conflicts:
	Zend/zend_compile.c
	ext/session/session.c
	ext/standard/array.c
	ext/standard/http_fopen_wrapper.c
	tests/classes/bug63462.phpt
2014-06-18 17:50:27 +04:00
Lior Kaplan
9f727692b6 Update copyright year to 2014
Align with online version at http://www.php.net/license/3_01.txt
2014-06-18 00:16:23 +03:00
Christopher Jones
94d092dea3 Make a start on phpng compat 2014-05-21 16:43:44 -07:00
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
Christopher Jones
8bdf272758 Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing 2014-03-19 14:10:56 -07:00
Christopher Jones
601367ee75 Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries) 2014-03-10 16:33:35 -07:00
Veres Lajos
a7ec000f35 a few typofixes 2014-02-14 17:16:17 +02:00
Christopher Jones
9da5118af8 Fix merge 2014-02-10 17:04:38 -08:00
Christopher Jones
2cbd857283 Add Oracle PL/SQL BOOLEAN type support to oci_bind_by_name() 2014-02-10 15:00:42 -08:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Christopher Jones
bc748ba38c OCI8 build change: Fix source variable definition for C89 compatibility 2013-12-12 15:22:55 -08:00
Christopher Jones
e68c1ef2ec Added a LICENSE file to make it easier for PECL binary distributions to conform with the license. 2013-10-22 11:03:09 -07:00
Christopher Jones
5e368b76ed Add missing test to package.xml 2013-10-17 13:49:50 -07:00
Christopher Jones
c59d790949 Prepare for OCI8 2.0.5 release 2013-10-17 12:15:45 -07:00
Christopher Jones
89e93bd2a2 OCI8: More test updates 2013-10-16 22:33:34 -07:00
Christopher Jones
0d909f5bfc OCI8: Mostly SKIPIF version updates to simplify version checks at the expense of not testing some edge cases with older Oracle patch set versions.
Delete two obsolete .phpt's.
2013-10-16 22:02:32 -07:00
Christopher Jones
5ae8c51e68 OCI8: sync README and package.xml descriptions 2013-10-10 13:38:38 -07:00
Christopher Jones
141c2cb97a Re-enable OCI8 DLL builds with Oracle 10g & 11g client libraries on
Windows, in addition to Oracle 12c.  From discussions with Anatol &
Pierre this seems to be the most direct way for the Windows PECL build
scripts to automatically create links to the generated DLLs.  The
issue is that the name php_oci8_12c.dll doesn't match the package
name.

In the far future when php_oci8.dll (with Oracle 10g) is no longer
built then another Windows PECL packaging fix will be needed.
2013-10-09 12:17:11 -07:00
Christopher Jones
f0863fa43a Add new tests to package.xml 2013-10-07 17:38:56 -07:00
Christopher Jones
1675fd2277 Add new tests 2013-10-07 17:26:00 -07: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
0a3ee7b26b Prepare for next release 2013-09-27 17:16:02 -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
b6d0cb0553 Build OCI8 2.0 on Windows with Oracle Database 12c libraries only 2013-09-18 19:50:32 -07:00
Christopher Jones
43289d664c Remove obsolete flag 2013-09-06 10:12:16 -07:00
Christopher Jones
ca4d122adc Update DTrace probes 2013-09-06 08:54:19 -07:00
Christopher Jones
e504ed66a8 Add test for oci_set_* error changes 2013-09-06 08:14:18 -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
6ece550394 Cast time_t since some "dtrace -G" invocations fail on time_t arguments 2013-09-03 15:17:36 -07:00
Christopher Jones
d7ffca590b Allow OCI8 to be DTrace-enabled independently of core PHP's DTrace
status.  The proviso is OCI8 must be built "shared" when DTrace is
enabled.  This implementation (i) works around an incomplete core PHP
solution for extension tracing (ii) avoid any issues with DOF section
location and the complexities of needing to merge all provider .d
files for static builds (iii) allows OCI8 to be DTrace-enabled when
doing PECL installs of OCI8 on PHP versions without core PHP DTrace
support.

This is an initial patch i.e. it will undergo further testing.
2013-08-30 17:37:44 -07:00
Christopher Jones
82da51bbce OCI8: remove unused ext/oci8/config.m4 macro 2013-08-30 11:15:56 -07:00
Christopher Jones
e6053acd78 OCI8 whitespace: remove tabs embedded in code 2013-08-30 11:14:20 -07:00
Christopher Jones
49cd21e71c OCI8 2.0: add oci8-check-connection probe and do some renaming 2013-08-27 16:41:02 -07:00