clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,357 Commits 491 Branches 1,363 Tags 838 MiB
290becb1f1
Commit Graph

772 Commits

Author SHA1 Message Date
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Christopher Jones
7d59b2264e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-10-21 22:21:46 -07:00
Christopher Jones
dbb72de6c7 Re-fixed bug #60901 (Improve "tail" syntax for AIX installation) 
The original fix broke Solaris installs of OCI8
 2012-10-21 22:17:47 -07:00
Christopher Jones
85b0eda4c8 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
 2012-10-18 17:57:19 -07:00
Christopher Jones
af14da5714 Fixed bug #63307 (Unused variable in oci8.c) 
An output section for oci_internal_debug() was setting but not using a variable
 2012-10-18 17:53:00 -07:00
Christopher Jones
131dd88505 Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro) 
Improve high availability for explicitly terminated connections.
 2012-10-18 17:33:51 -07:00
Christopher Jones
3b38d14caf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-09-13 22:44:12 -07:00
Christopher Jones
9f44844d7c Change package.xml fix description 2012-09-13 22:43:10 -07:00
Christopher Jones
bbf5978e26 Fixed bug #60901 (Improve "tail" syntax for AIX installation) 2012-09-13 22:40:55 -07:00
Christopher Jones
c9265b1acd Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix skipifs
 2012-08-14 14:13:03 -07:00
Christopher Jones
6524a530df Fix skipifs 
Skipifs were referencing an unset variable
 2012-08-14 14:10:20 -07:00
Christopher Jones
2b934dfdf9 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Small test tidy up
 2012-08-14 11:45:24 -07:00
Christopher Jones
8c3bf96022 Small test tidy up 
Make some test changes so the tests can be run with the CLI webserver
 2012-08-14 11:41:36 -07:00
Xinchen Hui
8091256948 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-14 14:03:05 +08:00
Reeze Xia
0239437903 Skip tests reply on Zend MM turned on 
Those two tests have expect memory exhausted fatal error
 2012-08-11 00:34:37 +08:00
Xinchen Hui
c6ad98975e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Skip test while zend mm is disabled
 2012-07-29 13:26:05 +08:00
Xinchen Hui
880a6cee00 Skip test while zend mm is disabled 2012-07-29 13:25:31 +08:00
Christopher Jones
aa774a51d5 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add php.ini parameter checks for OCI8
 2012-03-30 16:17:37 -07:00
Christopher Jones
c56cfbd234 Add php.ini parameter checks for OCI8 
Add tests for OCI8 php.ini parameters particularly to check
which parameters can be changes with ini_set().
 2012-03-30 16:12:25 -07:00
Christopher Jones
00b4862167 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Update README
 2012-03-27 11:54:05 -07:00
Christopher Jones
968a330220 Update README 
More updates to OCI8 README as an excuse to try the PHP multi-dir git
workflow instructions.
 2012-03-27 11:19:33 -07:00
Christopher Jones
7164175e85 Add initialization tests for SQLT_INT binds 
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
 2012-03-22 13:24:46 -07:00
Christopher Jones
ab825fdc24 Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4 
* 'PHP-5.3' of ../php-5.3:
  Add initialization tests for SQLT_INT binds
 2012-03-21 16:14:51 -07:00
Christopher Jones
fe5785d92b Add initialization tests for SQLT_INT binds 
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
 2012-03-21 16:12:28 -07:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Christopher Jones
08f586984f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Minor text changes (to try new git repo)
 2012-03-19 15:18:06 -07:00
Christopher Jones
4a6d9b348f Minor text changes (to try new git repo) 2012-03-19 15:16:33 -07:00
Christopher Jones
19c0803b77 Test portability and coverage changes 2012-03-12 18:08:34 +00:00
Christopher Jones
b1575ce9af Test portability and coverage changes 2012-03-12 18:08:34 +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
Christopher Jones
57de041b14 r319456 also fixed the OCI8 part of #55301 (multiple null pointer) 2011-11-18 18:14:15 +00:00
Christopher Jones
1a30e9dd33 r319456 also fixed the OCI8 part of #55301 (multiple null pointer) 2011-11-18 18:14:15 +00:00
Christopher Jones
092a21cde3 Sync to 5.3 and check additional cases for #55748 2011-11-18 09:59:35 +00:00
Christopher Jones
28cfee291e Sync to 5.3 and check additional cases for #55748 2011-11-18 09:59:35 +00:00
Stanislav Malyshev
77d0643b68 fixes for bug #55748 2011-11-18 07:11:19 +00:00
Christopher Jones
0c00f3a15c OCI8: Fixed bug #59985 (show normal warning text for OCI_NO_DATA). Sync NEWS. 2011-11-10 22:47:00 +00:00
Christopher Jones
4827f5c5d7 OCI8: Fixed bug #59985 (show normal warning text for OCI_NO_DATA). Sync NEWS. 2011-11-10 22:47:00 +00:00
Christopher Jones
1437890872 Add tests for unsupported types 2011-11-09 06:19:07 +00:00
Christopher Jones
8006a6723c Add tests for unsupported types 2011-11-09 06:19:07 +00:00
Christopher Jones
b44adcd5ce Improve OCI8 NLS env creation error messages (#58925) 2011-11-07 20:10:41 +00:00
Christopher Jones
76d68f8dbd Improve OCI8 NLS env creation error messages (#58925) 2011-11-07 20:10:41 +00:00
Christopher Jones
acd96cdebe Bump OCI8 version to 1.4.7 stable in preparation for PHP 5.3.9 2011-11-03 22:13:34 +00:00
Christopher Jones
0a2bf3ee32 Bump OCI8 version to 1.4.7 stable in preparation for PHP 5.3.9 2011-11-03 22:13:34 +00:00
Christopher Jones
2e6db16f51 Replace custom "stress_test" setting with generic SKIP_SLOW_TESTS 2011-11-03 21:52:59 +00:00
Christopher Jones
623b4231b5 Replace custom "stress_test" setting with generic SKIP_SLOW_TESTS 2011-11-03 21:52:59 +00:00
Christopher Jones
8b4890e18e Update for new Oracle patchset variation 2011-11-01 21:30:57 +00:00