mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-19 23:11:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
90,073 Commits 503 Branches 1,387 Tags 836 MiB
34e6fbbfed
Commit Graph

90073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Jones
0a02cdf775 First pass migrating PDO_OCI to PHP 7 2015-05-01 18:22:41 -07:00
Christopher Jones
be806eba80 Export free_statement to replace php_pdo_stmt_delref which was deleted in 9fe8531309 along with php_pdo_stmt_addref 2015-05-01 18:17:34 -07:00
Andy Footner
ed87d16c38 fix typo in php.ini 2015-05-01 12:38:07 +02:00
Stanislav Malyshev
c27f012b7a Fix bug #69453 - don't try to cut empty string 2015-04-29 22:51:43 -07:00
Stanislav Malyshev
ac28329354 Fix bug #69545 - avoid overflow when reading list 2015-04-29 22:50:18 -07:00
Stanislav Malyshev
98fe9405e2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Upgrade to PCRE 8.37 due to various bugfixes

Conflicts:
	ext/pcre/config.w32
	ext/pcre/config0.m4
	ext/pcre/pcrelib/pcre_jit_compile.c
	ext/pcre/pcrelib/sljit/sljitConfig.h
	ext/pcre/pcrelib/sljit/sljitConfigInternal.h
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeARM_64.c
	ext/pcre/pcrelib/sljit/sljitNativeARM_T2_32.c
	ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c
	ext/pcre/pcrelib/sljit/sljitNativePPC_common.c
	ext/pcre/pcrelib/sljit/sljitNativeSPARC_common.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pcre/pcrelib/sljit/sljitNativeX86_32.c
	ext/pcre/pcrelib/sljit/sljitNativeX86_64.c
	ext/pcre/pcrelib/sljit/sljitNativeX86_common.c
	ext/pcre/pcrelib/sljit/sljitUtils.c
 2015-04-29 22:34:54 -07:00
Stanislav Malyshev
428d0983cd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Upgrade to PCRE 8.37 due to various bugfixes
 2015-04-29 22:28:04 -07:00
Stanislav Malyshev
ce6db558f9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Upgrade to PCRE 8.37 due to various bugfixes
 2015-04-29 22:27:21 -07:00
Stanislav Malyshev
95fa727992 Upgrade to PCRE 8.37 due to various bugfixes 2015-04-29 22:27:07 -07:00
Ferenc Kovacs
972e94a24d Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.6.10 will be next
 2015-04-30 00:03:46 +02:00
Ferenc Kovacs
9c7496e0dd 5.6.10 will be next 2015-04-30 00:01:55 +02:00
Nikita Popov
16a9bc1ec2 Disallow self etc outside classes at compile-time 
Also fix a bug with return types where "self" was rejected inside
a class, but not on a method.

Fallout: A couple of tests changed to more generic error messages.
 2015-04-29 20:51:08 +02:00
Dmitry Stogov
d880ead8a7 Improve fast_is_[not_]identical() functions to teturn value instead of takeing additional arguments. 
Pair INSTANCEOF with the following JMPZ/JMPNZ.
 2015-04-29 16:43:23 +03:00
Dmitry Stogov
1d718fe859 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  5.5.26 now
 2015-04-29 14:21:29 +03:00
Dmitry Stogov
762a774c40 Fixed repeatable opcodes on CALL VM without global registers 2015-04-29 14:20:44 +03:00
Julien Pauli
f1fa3c4b92 Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.5.26 now
 2015-04-29 11:22:05 +02:00
Julien Pauli
d004c1d5ff Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.5.26 now

Conflicts:
	configure.in
	main/php_version.h
 2015-04-29 11:21:18 +02:00
Julien Pauli
775d0707ca 5.5.26 now 2015-04-29 11:16:06 +02:00
Dmitry Stogov
690440771a Paired instuctions frequientiy used together (e.g. comparisons + conditional jumps) 2015-04-29 04:17:59 +03:00
Derick Rethans
c2ef8a9acc Merge branch 'PHP-5.6' 2015-04-29 00:29:04 +01:00
Derick Rethans
ce9b6e5ee8 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-29 00:28:56 +01:00
Derick Rethans
6a5798d990 Use new structures for tzdb header here as well 2015-04-29 00:28:50 +01:00
Derick Rethans
0f4d527722 Merge branch 'PHP-5.6' 2015-04-29 00:28:20 +01:00
Derick Rethans
66c7eea659 Merge branch 'PHP-5.5' 2015-04-29 00:28:04 +01:00
Derick Rethans
7d6d8a3369 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-29 00:27:55 +01:00
Derick Rethans
df49ce3d5a This doesn't work in PHP 5.5 - sigh, I wish the libs were kept in sync 2015-04-29 00:25:29 +01:00
Derick Rethans
f179852f83 Merge branch 'PHP-5.6' 
Conflicts:
	ext/date/lib/parse_tz.c
 2015-04-29 00:10:40 +01:00
Derick Rethans
a1fef89abe Merge branch 'PHP-5.5' into PHP-5.6 2015-04-29 00:09:00 +01:00
Derick Rethans
912e42fc23 Split header reading in 32bit and 64bit variants. 
We need to use the 64bit header for the second set of transitions, as there
could be a different amount of transitions. This also opens up the way towards
real 64bit support.
 2015-04-29 00:08:28 +01:00
Dmitry Stogov
d271d2cf7b Make ZEND_RECV_INIT and ZEND_BIND_GLOBALS opcodes to be "repeatabe" with inner-loop instead of main interpreter loop. 2015-04-29 00:40:43 +03:00
Dmitry Stogov
3057034608 Optimize opcodes for fast path 2015-04-28 23:57:21 +03:00
Dmitry Stogov
388c2cbdbc Micro optimizations 2015-04-28 19:11:45 +03:00
Dmitry Stogov
612de5214f Simplified code 2015-04-28 19:11:23 +03:00
Anatol Belski
27a6ab5bc5 updated NEWS and fixed a typo 2015-04-28 17:08:03 +02:00
Derick Rethans
54f016ad77 Merge branch 'PHP-5.6' 
Conflicts:
	ext/date/lib/parse_iso_intervals.re
	ext/date/lib/timelib.h
 2015-04-28 15:58:30 +01:00
Derick Rethans
43c69443bb Merge branch 'PHP-5.5' into PHP-5.6 2015-04-28 15:57:35 +01:00
Derick Rethans
cdd2b8a79f Merge whitespace changes that have been made to timelib and PHP-5.6 and master 2015-04-28 15:57:26 +01:00
Anatol Belski
25a353f231 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  backported patch for bug #69472
 2015-04-28 15:35:01 +02:00
Anatol Belski
c4739897e7 updated NEWS 2015-04-28 15:34:11 +02:00
Anatol Belski
4af9ca544e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  backported patch for bug #69472
 2015-04-28 15:32:22 +02:00
Anatol Belski
3cd3881574 backported patch for bug #69472 2015-04-28 15:31:47 +02:00
Jan Starke
6e4a1b7862 Fixed bug #69472 php_sys_readlink ignores misc errors from GetFinalPathNameByHandleA 2015-04-28 15:28:57 +02:00
Anatol Belski
7857b8a253 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #69381 out of memory with sage odbc driver
 2015-04-28 15:15:30 +02:00
Anatol Belski
5cfb81d5b0 updated NEWS 2015-04-28 15:14:45 +02:00
Anatol Belski
b78f8220e7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #69381 out of memory with sage odbc driver
 2015-04-28 15:13:46 +02:00
Anatol Belski
1c7a902d8a updated NEWS 2015-04-28 15:13:19 +02:00
Frederic Marchal
f505d11207 Fixed bug #69381 out of memory with sage odbc driver 
This is just a hotfix as there are still drivers with no full
ODBC 3.x support. This patch origins from bug #68350 which was
solved by the proper 3.0 migration, another driver (Sage)
turned out to have the real issue.
 2015-04-28 15:08:53 +02:00
Anatol Belski
268eb1999b fix bug #69381 
a simpler version is to be backported
 2015-04-28 15:02:48 +02:00
Anatol Belski
ac275f9e31 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix VC9 build with PCRE
  Revert "Fix segfault in ext/date since 957aa2"
  Revert "Fix segfault in ext/date since 957aa2"
 2015-04-28 14:39:30 +02:00
Anatol Belski
7ccafe40c2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix VC9 build with PCRE
  Revert "Fix segfault in ext/date since 957aa2"
 2015-04-28 14:38:45 +02:00