clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,587 Commits 494 Branches 1,367 Tags 786 MiB
a4ff610e1c
Commit Graph

74587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Jones
a4ff610e1c Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed compatibility with php-5.2
  Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).
 2013-08-29 05:40:27 -07:00
Dmitry Stogov
5015c4af6c Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var) 2013-08-29 11:56:01 +04:00
Dmitry Stogov
0f3977bc0f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)

Conflicts:
	NEWS
 2013-08-29 11:19:02 +04:00
Dmitry Stogov
dfc6feb6e8 Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien) 2013-08-29 11:16:56 +04:00
Dmitry Stogov
15694f66b2 Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien) 2013-08-29 11:12:06 +04:00
Dmitry Stogov
94816ed9bf Fixed compatibility with php-5.2 2013-08-29 10:44:07 +04:00
Dmitry Stogov
632f733ce4 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).
 2013-08-29 10:32:21 +04:00
Dmitry Stogov
790db9ff9b Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison) 2013-08-29 10:29:48 +04:00
Xinchen Hui
e356d790cc Merge branch 'PHP-5.4' into PHP-5.5 2013-08-29 14:02:34 +08:00
Xinchen Hui
747daa5354 Avoid compiler warning 2013-08-29 14:02:15 +08:00
Xinchen Hui
f0cb67402f Merge branch 'PHP-5.4' into PHP-5.5 2013-08-29 14:01:54 +08:00
Adam Harvey
72027cd084 Fix bug #65579 (Using traits with get_class_methods causes segfault). 
Specifically, this checks if there are trait aliases defined in the class scope
before attempting to dereference the first trait alias. This handles the case
where a trait alias was used in a child trait but no aliases exist in the
concrete class.
 2013-08-28 20:33:42 -07:00
Christopher Jones
3697584e05 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  removed the /Wp64 switch as we use true 64 bit compiler now
  updated lib versions
  updated lib versions, the vc11 ones only matter now
 2013-08-28 11:14:37 -07:00
Anatol Belski
bd677b43a7 removed the /Wp64 switch as we use true 64 bit compiler now 2013-08-28 15:10:05 +02:00
Anatol Belski
5a525bc823 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated lib versions
 2013-08-28 14:43:36 +02:00
Anatol Belski
3745bdadc0 updated lib versions 2013-08-28 14:43:00 +02:00
Anatol Belski
51016262a7 updated lib versions, the vc11 ones only matter now 2013-08-28 14:25:39 +02:00
Xinchen Hui
0119bbba6b Fixed compiler warnings 
warning: 'local_dval' may be used uninitialized in this function
[-Wmaybe-uninitialized]

warning: 'dval2' may be used uninitialized in this function
[-Wmaybe-uninitialized]
 2013-08-27 15:44:30 +08:00
Dmitry Stogov
1c67a9940a Fixed compilation warning 2013-08-26 09:48:10 +04:00
Stanislav Malyshev
825a505494 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/lib/parse_date.re
 2013-08-25 15:14:17 -07:00
gron1987
e6424d89e9 Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end 2013-08-25 15:09:29 -07:00
Stanislav Malyshev
e045cbaa14 Merge branch 'fix_travis' into PHP-5.5 
* fix_travis:
  fix mysql tests & mark nextRowset problematic tests
  fix mysql init
  add openssl
  add mysql settings
 2013-08-25 00:29:33 -07:00
Stanislav Malyshev
a2d8ae9a1f fix mysql tests & mark nextRowset problematic tests 2013-08-24 23:56:48 -07:00
Stanislav Malyshev
c0bfccafd2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix DateInterval->days value when object was created not from DateTime::diff()
 2013-08-24 23:38:54 -07:00
Alexander Moskalev
b378b0b081 Fix DateInterval->days value when object was created not from DateTime::diff() 2013-08-24 23:38:33 -07:00
Stanislav Malyshev
a89e71397d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Test extension xmlrpc encode type double and string decode type string and int
 2013-08-24 21:45:14 -07:00
root
e22c139fe0 Test extension xmlrpc encode type double and string decode type string and int 2013-08-24 21:44:50 -07:00
Stanislav Malyshev
286c745d81 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Stricter libc-client symlink check
 2013-08-24 21:40:52 -07:00
Ole Markus With
6b8dade6dc Stricter libc-client symlink check 2013-08-24 21:40:26 -07:00
Joey Smith
2139d2702d Expose fputcsv's escape_char to userland 
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
 2013-08-24 20:45:14 -07:00
Stanislav Malyshev
bdccf0a61d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
  Update NEWS
 2013-08-24 19:49:27 -07:00
Michael M Slusarz
3f9af558e7 Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces 2013-08-24 19:45:54 -07:00
Stanislav Malyshev
817eebc733 fix mysql init 2013-08-24 19:39:00 -07:00
Stanislav Malyshev
f57a722c85 add openssl 2013-08-24 19:38:46 -07:00
Stanislav Malyshev
f31d6bc0d9 add mysql settings 2013-08-24 19:38:30 -07:00
Anatol Belski
716fc80fda Suppress static analyzer warnings in specialized executor 
As things like if(0) will be removed by the compiler, no need
to see that tons of warnings with static analyzer enabled.
 2013-08-23 17:41:07 +02:00
Christopher Jones
38f9c515cd Update NEWS 2013-08-23 08:18:33 -07:00
Christopher Jones
768c34e7cd Update NEWS 2013-08-23 08:13:59 -07:00
Anatol Belski
a2b1546f3b ensure the test doesn't fail because of tz warning 2013-08-23 16:40:28 +02:00
Nikita Popov
686402a865 Merge branch 'PHP-5.4' into PHP-5.5 2013-08-23 13:28:59 +02:00
Christopher Jones
5ab6d215fc Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases 2013-08-23 13:27:42 +02:00
Christopher Jones
c1ecdfbf6e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
  Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
 2013-08-22 09:06:43 -07:00
Christopher Jones
7109f369e8 Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type" 2013-08-22 09:05:52 -07:00
Christopher Jones
18282f42c5 Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"" 
This reverts commit f38bd22ed2.
 2013-08-22 08:58:35 -07:00
Christopher Jones
f2ceb4963e Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"" 
This reverts commit f38bd22ed2.
 2013-08-22 08:58:24 -07:00
Matteo Beccati
908da14bd1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed other compiler warnings
 2013-08-22 15:34:11 +02:00
Matteo Beccati
d5987478a8 Fixed other compiler warnings 2013-08-22 15:33:54 +02:00
Nikita Popov
c0d99fd76a Apply pgsql notice test fixes to PHP-5.5 2013-08-22 14:02:55 +02:00
Nikita Popov
592677d810 Fix intl build 
Turns out that you can't use implicit void pointer casts if intl
is compiled.
 2013-08-22 11:46:51 +02:00
Nikita Popov
fc16b92313 Fix bug #46311: Pointer aliasing issue results in miscompile on gcc4.4 
The code violated the strict aliasing restriction, because it
dereferenced the same pointer as zval** once and as void**
afterwards. Now both occurances dereference void** and cast to
zval* in the former case.
 2013-08-22 10:56:50 +02:00