clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
90,090 Commits 491 Branches 1,363 Tags 844 MiB
bb27f4ca8b
Commit Graph

178 Commits

Author SHA1 Message Date
Dmitry Stogov
70c86732cb Use zend_string to represent pdo_column_data.name and avoid duplication. 2015-05-05 16:19:51 +03:00
Anatol Belski
19360f386e cleanup mod version macros, round 3 2015-03-23 20:54:55 +01:00
Maxime BESSON
f384971552 Look for PDO include files in the right folder 
Configure scripts for extensions look for PDO include files in
$prefix/include/php. This change makes them look into $phpincludedir
instead, which may be different from $prefix/include/php.
 2015-02-06 12:06:29 +01:00
Stanislav Malyshev
dfe6aea9ca size_t cleanup for PDO 2015-01-26 16:16:02 -08:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski
e112f6a04e second shot on removing TSRMLS_* 2014-12-14 14:07:59 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
4ed156d4df ported from pdo - pgsql, odbc, mysql, firebirt, dblib 2014-08-19 19:02:07 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
8296129e50 cleanuo (use zend_string instead of char*) 2014-08-13 22:26:07 +04:00
Dmitry Stogov
8210b3b8c4 ext/pdo_odbc support for phpng (tested with unixODBC and mysql driver) 2014-08-12 11:00:06 +04: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
Andrew Kehrig
186ffcb72c Fix #50444: PDO-ODBC changes for 64-bit 
This bug is also referenced in
[#61777](https://bugs.php.net/bug.php?id=61777) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.
 2014-04-20 16:49:15 -07:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Felipe Pena
8e36d36ee6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
 2013-12-22 09:42:58 -02:00
Felipe Pena
a056113586 - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com 2013-12-22 09:42:45 -02:00
Anatol Belski
5e5ecaea6e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed possibly uninitialized value usage
 2013-12-17 08:45:07 +01:00
Anatol Belski
2303d0ea22 fixed possibly uninitialized value usage 2013-12-17 08:44:22 +01:00
Christopher Jones
7160adf4ad Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Remove some compilation warnings:   'unused variable' and   'enumeration value not handled in switch'
 2013-08-20 10:34:13 -07:00
Christopher Jones
b455ba971c Remove some compilation warnings: 
'unused variable' and
  'enumeration value not handled in switch'
 2013-08-20 10:33:00 -07:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Xinchen Hui
931571260b Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:15:18 +08:00
Xinchen Hui
45e0d452c5 Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec) 2012-10-09 13:13:51 +08:00
Anatoliy Belsky
bd39495332 Fix for bug #62379 was missing in 5.3 2012-07-17 17:50:05 +02:00
Matt Ficken
10251b20c3 Fixed bug #62379 failing ODBC long column functionality 2012-07-13 15:34:00 +02:00
Ilia Alshanetsky
601d17d1ae Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). 2012-03-14 20:20:33 +00:00
Ilia Alshanetsky
0af900f976 Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). 2012-03-14 20:20:33 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
997f323e3a - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Pierre Joye
a20deb1607 - Fix #55301 (pdo_odbc part) check if malloc succeded 2011-07-28 10:37:04 +00:00
Pierre Joye
3f28c4eb11 - Fix #55301 (pdo_odbc part) check if malloc succeded 2011-07-28 10:37:04 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
4f21d3132e - Fixed data type usage in 64bit 
Reported by: Leonildo Costa
 2011-06-27 01:36:39 +00:00
Felipe Pena
92ef080a2e - Fixed data type usage in 64bit 
Reported by: Leonildo Costa
 2011-06-27 01:36:39 +00:00
Rasmus Lerdorf
d257aa42ff Oops, can't cache it here because it won't work 
in autoconf2.13 and we still support that version
in this branch
 2011-05-15 05:49:34 +00:00
Rasmus Lerdorf
8e256774b0 Cache the PDO include path 2011-05-15 05:24:34 +00:00
Rasmus Lerdorf
78a15091f9 Cache the pdo include path 2011-05-15 05:03:29 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Johannes Schlüter
26b08f9857 Remove main/php3_compat.h, for that a few references to function_entry have 
to be replaced by `zend_function_entry`.
 2010-03-30 23:03:02 +00:00