clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,012 Commits 494 Branches 1,367 Tags 810 MiB
c6a218c76b
Commit Graph

75012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Jones
423b132a7a Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. 
(note OCI8 already builds with Oracle Database 12c)
 2013-06-25 11:55:41 -07:00
Xinchen Hui
d99a76ca96 Merge branch 'PHP-5.5' 2013-06-25 13:48:54 +08:00
Xinchen Hui
157ccaf507 Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c) 
I can not get a reproduce script since the context is very strict.

Of course I will try to make one, but for now, I just commit this first.
 2013-06-25 13:47:50 +08:00
Xinchen Hui
d8374c5590 Merge branch 'PHP-5.5' 2013-06-25 13:40:19 +08:00
Xinchen Hui
efd3c72de3 Update NEWS 2013-06-25 13:39:31 +08:00
Xinchen Hui
9d9ec2a90e Merge branch 'PHP-5.4' into PHP-5.5 2013-06-25 13:38:50 +08:00
Xinchen Hui
38eb909d06 Fixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice) 2013-06-25 13:38:27 +08:00
Christopher Jones
0093980fe0 Some tidy-ups: Don't mention Logo GUIDs in three places; mention 
password_hash functionality; add some doc URLs for new features;
grammar & typos; formatting changes.
 2013-06-24 17:12:35 -07:00
Felipe Pena
ba3278d9e6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
  - BFN
 2013-06-24 16:50:19 -03:00
Felipe Pena
ff292d619c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
  - BFN
 2013-06-24 16:49:22 -03:00
Felipe Pena
982c11573d - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com 2013-06-24 16:49:15 -03:00
Felipe Pena
d43a2f0ffb - BFN 2013-06-24 14:50:14 -03:00
Felipe Pena
33472f78f9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
 2013-06-24 14:48:28 -03:00
Felipe Pena
4b41959f9e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
 2013-06-24 14:47:40 -03:00
Felipe Pena
8776555d7a - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch 2013-06-24 14:43:35 -03:00
Xinchen Hui
83673eaf1d Merge branch 'PHP-5.5' 2013-06-24 23:53:54 +08:00
Xinchen Hui
47035ba5c9 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-06-24 23:49:45 +08:00
Xinchen Hui
a6a3aa5d49 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_API.c
 2013-06-24 23:49:30 +08:00
Xinchen Hui
9cf3e65391 Fixed bug (is_callable() triggers Fatal Error) 
This bug is also exists in 5.4, and previous fix by dsp is not complete
for __callStatic stituation, see test script
 2013-06-24 23:45:08 +08:00
David Soria Parra
e972b54b30 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Notify doc team BEFORE we release
 2013-06-24 17:44:04 +02:00
David Soria Parra
0ddfafe489 Notify doc team BEFORE we release 2013-06-24 17:44:00 +02:00
David Soria Parra
a496e62f13 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix #65108 (is_callable() triggers Fatal Error)
 2013-06-24 17:22:02 +02:00
David Soria Parra
ecd9d76250 Fix #65108 (is_callable() triggers Fatal Error) 
We have to check if the fcall info cache contains a pointer if we
use __call, otherwise we endup in a static lookup.
 2013-06-24 15:55:10 +02:00
Remi Collet
8e4e38aaee Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix imagecreatefromwebp and imagewebp protos
 2013-06-24 11:15:56 +02:00
Remi Collet
9da4985bf2 fix imagecreatefromwebp and imagewebp protos 2013-06-24 11:15:50 +02:00
Remi Collet
8c694401bb Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use same logic to load WebP image that other formats
 2013-06-24 11:11:02 +02:00
Remi Collet
8075f1f4a3 Use same logic to load WebP image that other formats 2013-06-24 11:10:52 +02:00
Remi Collet
6c56d785ae Merge branch 'PHP-5.5' 
* PHP-5.5:
  Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
 2013-06-24 11:04:10 +02:00
Remi Collet
b4632d0c12 Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75 2013-06-24 11:03:12 +02:00
Dmitry Stogov
0c9de2d94b Merge branch 'PHP-5.5' 
* PHP-5.5:
  OPcache must be compatible with LiteSpeed SAPI

Conflicts:
	NEWS
 2013-06-24 12:01:58 +04:00
Dmitry Stogov
f49b27e166 OPcache must be compatible with LiteSpeed SAPI 2013-06-24 11:59:50 +04:00
Stanislav Malyshev
91cc70c430 Merge branch 'PHP-5.5' 
* PHP-5.5:
  seems to be working fine for me on 32-bit
 2013-06-23 23:38:15 -07:00
Stanislav Malyshev
ae5a09b47d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  seems to be working fine for me on 32-bit
 2013-06-23 23:37:10 -07:00
Stanislav Malyshev
a0d48e01ed seems to be working fine for me on 32-bit 2013-06-23 23:36:43 -07:00
Stanislav Malyshev
30227f7a59 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #62759: Buggy grapheme_substr() on edge case
 2013-06-23 21:27:20 -07:00
Stanislav Malyshev
9872835cf3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #62759: Buggy grapheme_substr() on edge case
 2013-06-23 21:27:08 -07:00
Stanislav Malyshev
860a5c4b01 Fix bug #62759: Buggy grapheme_substr() on edge case 2013-06-23 21:26:16 -07:00
Stanislav Malyshev
46c46921b1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Require second parameter of imagecrop()
 2013-06-23 20:30:03 -07:00
Jakub Vrana
e1acaea4f1 Require second parameter of imagecrop() 2013-06-23 20:29:54 -07:00
Stanislav Malyshev
e02b41d25c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
 2013-06-23 15:26:30 -07:00
Stanislav Malyshev
1beb24bd6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.

Conflicts:
	ext/sockets/sockets.c
 2013-06-23 15:26:14 -07:00
Damjan Cvetko
a0b4348abc Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket. 2013-06-23 15:20:54 -07:00
Stanislav Malyshev
c593b42a0c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Adding test to verify that __sleep can handle parent classes' private members
  Adding test to stabelize keys used when converting objects to arrays
 2013-06-23 13:55:03 -07:00
Stanislav Malyshev
7272e3e722 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Adding test to verify that __sleep can handle parent classes' private members
  Adding test to stabelize keys used when converting objects to arrays
 2013-06-23 13:54:50 -07:00
Marco Pivetta
f1e37d03c1 Adding test to verify that __sleep can handle parent classes' private members 2013-06-23 13:53:46 -07:00
Marco Pivetta
61fb822d1a Adding test to stabelize keys used when converting objects to arrays 2013-06-23 13:53:37 -07:00
Adam Harvey
f94f17397e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #65088 (Generated configure script is malformed on OpenBSD).
 2013-06-23 11:04:36 -07:00
Adam Harvey
296a12efbb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65088 (Generated configure script is malformed on OpenBSD).
 2013-06-23 11:04:10 -07:00
Adam Harvey
2531307be6 Fix bug #65088 (Generated configure script is malformed on OpenBSD). 
We fell foul of a "common urban legend"[0], which resulted in us backslash
escaping double quotes that we didn't need to in acinclude.m4. This worked fine
on most shells, but OpenBSD's ksh implementation really didn't like it.

[0] http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Shell-Substitutions.html
 2013-06-23 11:02:00 -07:00
Remi Collet
20dbd27108 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed Bug #65060 imagecreatefrom... crashes with user streams Fixed Bug #65084 imagecreatefromjpeg fails with URL
 2013-06-21 14:11:33 +02:00