clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,092 Commits 494 Branches 1,367 Tags 807 MiB
56eee05f66
Commit Graph

76092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
462f2167ae Merge branch 'PHP-5.5' 
* PHP-5.5:
  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:20:12 +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
c8673b64ce Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed compatibility with php-5.2
 2013-08-29 10:45:00 +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
6ff7dd05bf Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).
 2013-08-29 10:31:50 +04:00
Dmitry Stogov
b6864d978c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)

Conflicts:
	NEWS
 2013-08-29 10:31:14 +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
0ea00936be Merge branch 'PHP-5.5' 2013-08-29 14:02:53 +08: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
6d66d613f6 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' 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:51 -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
Christopher Jones
1fdcc705a4 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  updated lib versions
 2013-08-28 11:14:29 -07:00
Anatol Belski
82bb2a2535 Merge branch 'PHP-5.5' 
* PHP-5.5:
  removed the /Wp64 switch as we use true 64 bit compiler now
 2013-08-28 15:10:42 +02: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
29fa735dfc Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated lib versions
 2013-08-28 14:43:53 +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
8cc1ee8c81 Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated lib versions, the vc11 ones only matter now
 2013-08-28 14:30:03 +02:00
Anatol Belski
51016262a7 updated lib versions, the vc11 ones only matter now 2013-08-28 14:25:39 +02:00
Christopher Jones
49cd21e71c OCI8 2.0: add oci8-check-connection probe and do some renaming 2013-08-27 16:41:02 -07:00
Michael Wallner
d4b673a34c fix ZTS build 2013-08-27 14:01:59 +02:00
Michael Wallner
bb1f9d3826 slim post data 2013-08-27 13:43:22 +02:00
Michael Wallner
2438490add slim post data 2013-08-27 13:31:35 +02:00
Xinchen Hui
72f80b2997 Merge branch 'PHP-5.5' 2013-08-27 15:45:27 +08: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
Christopher Jones
4b67c781f3 Use "__" consistently in OCI8 DTrace probe definitions. It maps to "-" in the probe name. 2013-08-26 15:42:57 -07:00
Christopher Jones
493ad87027 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Evaluate ZVAL_ZVAL arguments only once
 2013-08-26 14:36:22 -07:00
Christopher Jones
8aca4e45bb Leave it to DTrace FBT to trace underlying library calls 2013-08-26 14:20:58 -07:00
Nikita Popov
d18b969858 Evaluate ZVAL_ZVAL arguments only once 
Also remove some isref/refcount assignments, which are no longer
necessary (as ZVAL_COPY_VALUE is used now).
 2013-08-26 19:57:14 +02:00
Dmitry Stogov
a13c00cd14 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed compilation warning
 2013-08-26 09:49:22 +04:00
Dmitry Stogov
1c67a9940a Fixed compilation warning 2013-08-26 09:48:10 +04:00
Stanislav Malyshev
7c08ce243c Merge branch 'PHP-5.5' 
* PHP-5.5:
  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:14:36 -07: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
60854d1d26 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix mysql tests & mark nextRowset problematic tests
  fix mysql init
  add openssl
  add mysql settings
 2013-08-25 00:30:00 -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
a84bb6bf86 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix DateInterval->days value when object was created not from DateTime::diff()
 2013-08-24 23:39:13 -07:00
Stanislav Malyshev
01c028a475 Merge branch 'pull-request/322' 
* pull-request/322:
  Remove semicolon
  Fix DateInterval->days value when object was created not from DateTime::diff()
 2013-08-24 23:39:09 -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
cbc848a555 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Test extension xmlrpc encode type double and string decode type string and int
 2013-08-24 21:45:26 -07:00
Stanislav Malyshev
26cd3425ee Merge branch 'pull-request/419' 
* pull-request/419:
  Test extension xmlrpc encode type double and string decode type string and int
 2013-08-24 21:45:21 -07:00