clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,861 Commits 494 Branches 1,367 Tags 800 MiB
d880ead8a7
Commit Graph

38600 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Anatol Belski
768bbedf82 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix VC9 build with PCRE
 2015-04-28 14:38:21 +02:00
Anatol Belski
9c5c3ff022 fix VC9 build with PCRE 2015-04-28 13:15:39 +02:00
Matteo Beccati
e645837ba1 Revert "Fix segfault in ext/date since 957aa2" 
This reverts commit b5e5098c50.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)
 2015-04-28 12:56:15 +02:00
Matteo Beccati
4cabbf9781 Revert "Fix segfault in ext/date since 957aa2" 
This reverts commit b5e5098c50.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)
 2015-04-28 12:56:11 +02:00
Matteo Beccati
7778a5a9b4 Revert "Fix segfault in ext/date since 957aa2" 
This reverts commit b5e5098c50.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)
 2015-04-28 12:56:05 +02:00
Remi Collet
97fcbf041a relax tests with huge year (new zic) 2015-04-28 12:48:47 +02:00
Remi Collet
c1e84a3bde ignore second value for huge timestamp test (new zic) 2015-04-28 12:48:38 +02:00
Remi Collet
194e64982e relax test for date < INT32_MIN (new zic) 2015-04-28 12:48:30 +02:00
Remi Collet
ba41b340c2 relax bigbang content (new zic) 2015-04-28 12:48:23 +02:00
Remi Collet
c39e777722 Make date transitions tests more flexible 
zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)
 2015-04-28 12:48:13 +02:00
Matteo Beccati
94f0b940f9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix segfault in ext/date since 957aa2
 2015-04-28 11:08:46 +02:00
Matteo Beccati
df490dcf0c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix segfault in ext/date since 957aa2
 2015-04-28 10:57:52 +02:00
Matteo Beccati
b5e5098c50 Fix segfault in ext/date since 957aa2 2015-04-28 10:57:18 +02:00
Stanislav Malyshev
c34aba472c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Upgrade PCRE to 8.36, it fixes some crashes

Conflicts:
	ext/pcre/pcrelib/config.h
	ext/pcre/pcrelib/pcre_ucd.c
 2015-04-27 23:41:18 -07:00
Stanislav Malyshev
19ad1389aa Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Upgrade PCRE to 8.36, it fixes some crashes
 2015-04-27 23:30:57 -07:00
Stanislav Malyshev
13c32a102c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Upgrade PCRE to 8.36, it fixes some crashes
 2015-04-27 23:25:32 -07:00
Stanislav Malyshev
23917b451b Upgrade PCRE to 8.36, it fixes some crashes 
We probably will need to go to 8.37 once it is released.
 2015-04-27 23:16:54 -07:00
Xinchen Hui
38d79e9449 Drop unused num index 2015-04-28 11:26:58 +08:00
Nikita Popov
fc264da0e5 Cleanup substr_replace 2015-04-27 18:58:47 +02:00
Nikita Popov
40e465e357 Clean up some type conversions 
While at it also fix some type checks in iconv and drop dead and
unported code in standard/filters.
 2015-04-27 18:50:08 +02:00
Dmitry Stogov
5af7743cf5 Merge branch 'anon' 
* anon:
  Pass class_entry through IS_VAR to avoid hash lookup in ZEND_NEW.
  Use "safe" anonymous class names. Don't show the mangled names through var_dump().
  Refactored using specialized opcodes
  Fix implementing_class handling
  More cleanup (mainly retab)
  Don't issue FETCH_CLASS for anon classes
  More retab
  Simply anon class name generation
  Retab
  Revert unrelated changes / rebase fixup
  Rebase Joe's anon classes implementation
 2015-04-27 17:18:35 +03:00
Dmitry Stogov
ffe804a50c Use new hash iteration API. 2015-04-27 16:50:47 +03:00
Dmitry Stogov
94245bc14c Refactored using specialized opcodes 2015-04-27 12:24:39 +03:00
krakjoe
49608e0608 Rebase Joe's anon classes implementation 2015-04-26 15:04:22 +02:00
Derick Rethans
1a4d3e4855 Merge branch 'PHP-5.6' 2015-04-26 11:04:54 +01:00
Derick Rethans
1e18ffd2f8 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-26 11:04:35 +01:00
Derick Rethans
957aa220aa Fixed location reading due to file format changes 2015-04-26 11:04:16 +01:00
Nikita Popov
300b1db09f Tweak new deflate/inflate implementations 
Return NULL on zpp.
Don't manually cast zvals to long.
 2015-04-25 19:00:41 +02:00
Nikita Popov
e0a39eecf1 Respect USE_OTHER in spl_array_is_object 
Also a bit of code cleanup in get_hash_table.
 2015-04-25 16:13:39 +02:00
Nikita Popov
66ce7cc083 Don't store $this reference for IS_SELF AO 
The var_dump output changes in array_022.phpt were wrong previously,
the "storage" that was referenced there was not the actually used
storage.
 2015-04-25 16:13:37 +02:00
Nikita Popov
3140d0c0c8 Drop ArrayObject IS_REF flag 2015-04-25 16:13:32 +02:00
Derick Rethans
0cfbdb7200 - Updated to version 2015.4 (2015d) 2015-04-24 22:56:26 +01:00
Derick Rethans
ad9aaf8093 - Updated to version 2015.4 (2015d) 2015-04-24 17:22:33 +01:00
Derick Rethans
53c49994f2 - Updated to version 2015.4 (2015d) 2015-04-24 17:22:31 +01:00