clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,842 Commits 491 Branches 1,363 Tags 837 MiB
388c2cbdbc
Commit Graph

89842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
f4b2ce08c4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  relax tests with huge year (new zic)
  ignore second value for huge timestamp test (new zic)
  relax test for date < INT32_MIN (new zic)
  relax bigbang content (new zic)
  Make date transitions tests more flexible
 2015-04-28 12:50:30 +02:00
Remi Collet
4131f6bf39 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  relax tests with huge year (new zic)
  ignore second value for huge timestamp test (new zic)
  relax test for date < INT32_MIN (new zic)
  relax bigbang content (new zic)
  Make date transitions tests more flexible
 2015-04-28 12:50:09 +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
Dmitry Stogov
89be15c56d Micro optimizations 2015-04-28 12:41:39 +03: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
33e32cbe5b Make it inline 2015-04-28 11:30:25 +08:00
Xinchen Hui
38d79e9449 Drop unused num index 2015-04-28 11:26:58 +08:00
Xinchen Hui
e563386582 Fixed interned string leaks after new STATIC_KEY flag is introduced 2015-04-28 11:14:21 +08:00
Nikita Popov
422de8a7a7 Drop compile_class_decl return value 
Was introduced for anon classes, but no longer needed.
 2015-04-27 22:54:02 +02:00
Dmitry Stogov
98e9296f34 Restored accedently removed line that caused memory leak 2015-04-27 23:05:24 +03:00
hakre
6551f996b9 Minor Typo in Comment 2015-04-27 20:06:55 +02: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
1800bed104 Micro optimizations 2015-04-27 18:30:33 +03:00
Dmitry Stogov
ecaf49eb29 Added news entry 2015-04-27 17:21:16 +03: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