Ferenc Kovacs
f0fe3d2dbe
having xz makes it three. thanks Mike Ford for spotting it
2013-01-30 17:39:13 +01:00
Ferenc Kovacs
cbdf9ea34c
now we have also an xz archive
2013-01-30 14:12:38 +01:00
Stanislav Malyshev
15e76e6a98
forgot this file :(
2013-01-29 15:02:55 -08:00
Stanislav Malyshev
26de5cc57f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
branched 5.4.12
update NEWS
Conflicts:
configure.in
main/php_version.h
2013-01-29 12:34:45 -08:00
Stanislav Malyshev
09b6e33b40
branched 5.4.12
2013-01-29 12:33:45 -08:00
Stanislav Malyshev
7a6e76fd2f
update NEWS
2013-01-29 12:31:49 -08:00
Stanislav Malyshev
748b37654d
complete zts fix
2013-01-29 12:12:34 -08:00
Johannes Schlüter
78d3e66f3a
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-29 19:50:14 +01:00
Johannes Schlüter
078b025a15
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2013-01-29 19:50:00 +01:00
Johannes Schlüter
1433854681
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-29 19:49:43 +01:00
Johannes Schlüter
264279439b
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-01-29 19:49:39 +01:00
Johannes Schlüter
ec53b60072
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2013-01-29 19:49:13 +01:00
Johannes Schlüter
93fd9c704b
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)
2013-01-29 19:47:45 +01:00
Gustavo Lopes
3bedc8ec27
Fixed paramter count
2013-01-29 19:19:51 +01:00
Gustavo Lopes
9d1bdaa569
Make converter work on VS
2013-01-29 19:19:49 +01:00
Gustavo Lopes
1da67fc65e
intl/converter in line w/ intl error handling
2013-01-29 19:06:15 +01:00
Gustavo Lopes
a721fe2b22
Fix zpp() call in intl/converter
2013-01-29 19:06:14 +01:00
Gustavo Lopes
ee6522bebf
Write local err on intlcal_get_time_zone() failure
2013-01-29 19:06:14 +01:00
Gustavo Lopes
363fd6d6fb
Improve ERROR.CONVENTIONS
2013-01-29 19:06:14 +01:00
Gustavo Lopes
b4ba46cb99
Fix arginfo of BreakIterator::getLocale
2013-01-29 19:06:14 +01:00
Gustavo Lopes
4badc0c071
intl: doc explaining error conventions
2013-01-29 19:06:14 +01:00
Sara Golemon
1faddd15d9
Add UConverter class (ICU's UConverter API)
...
RFC at http://wiki.php.net/rfc/uconverter
2013-01-29 19:05:14 +01:00
Felipe Pena
37c304b5db
- Fixed ZTS build
2013-01-29 09:26:54 -02:00
Stanislav Malyshev
489073b501
Merge branch 'PHp-5.4' into PHP-5.5
...
* PHp-5.4:
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:28:50 -08:00
Stanislav Malyshev
5382e156f9
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:27:35 -08:00
Stanislav Malyshev
389d41cc2e
Add news for bug #60524
2013-01-28 22:55:55 -08:00
ALeX Kazik
475a644bd8
Implemented Feature #60524 (sys_temp_dir)
...
Added a new configuration directive which allows it to change the
temporary directory, the default behavior is unchanged.
This is a useful option if you use all/some hosts inside of one .ini file
with sections and want to change the temp dir per user (maybe it's not
allowed to write outside the users home directory). Since the TMPDIR
variable affects the whole php that way can not be used for this scenario.
(see https://bugs.php.net/bug.php?id=60524 )
2013-01-28 22:37:43 -08:00
Stanislav Malyshev
a9d013bb02
Implement fix for bug #46439 - add CURLFile class for safer uploads
2013-01-28 22:22:59 -08:00
Stanislav Malyshev
420bcc1a8e
add new features
2013-01-28 12:13:13 -08:00
Anatoliy Belsky
263a220997
allow for libpng 1.5.x
2013-01-28 13:23:31 +01:00
Stanislav Malyshev
184db665eb
fix bug #60833 - self, parent, static behave inconsistently case-sensitive
2013-01-27 18:02:51 -08:00
Stanislav Malyshev
581db9c5fa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix missing parameter
2013-01-27 17:11:36 -08:00
Andras Elso
3e6d633a0d
Fix missing parameter
2013-01-27 17:11:14 -08:00
Stanislav Malyshev
d86e14b8f6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix tests
2013-01-23 10:45:01 -08:00
Stanislav Malyshev
122570443b
fix tests
2013-01-23 10:44:53 -08:00
Stanislav Malyshev
dc617c74fa
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix valgrind warning
Fix bug #64023 (__toString() & SplFileInfo)
Fix test related to change for #bug64007 and also fix in newInstanceArgs
NEWS: Start PHP 5.5.0 Beta 1 section
NEWS for PHP 5.5.0alpha4
Fix NEWS
2013-01-23 10:44:53 -08:00
Stanislav Malyshev
beb5c8e551
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix tests
2013-01-23 10:44:38 -08:00
Stanislav Malyshev
bcf922b0f8
fix tests
2013-01-23 10:44:25 -08:00
Gustavo Lopes
38bf6951b3
NEWS for bug #64023 (see aa0adce
)
2013-01-23 13:30:40 +01:00
Gustavo Lopes
fc7b054c2d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:24:50 +01:00
Andrey Hristov
95346c017c
fix valgrind warning
2013-01-22 16:48:39 +01:00
Gustavo Lopes
b8b3bb08b2
Merge branch 'bug64023' into PHP-5.4
...
* bug64023:
Fix bug #64023 (__toString() & SplFileInfo)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-01-22 12:24:33 +01:00
Gustavo Lopes
aa0adce47d
Fix bug #64023 (__toString() & SplFileInfo)
...
Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().
Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
2013-01-22 11:33:29 +01:00
Xinchen Hui
e6bde1f8f6
Fix test related to change for #bug64007 and also fix in newInstanceArgs
2013-01-22 16:58:40 +08:00
David Soria Parra
51e5022364
NEWS: Start PHP 5.5.0 Beta 1 section
2013-01-22 09:45:04 +01:00
David Soria Parra
ca734cfbc7
NEWS for PHP 5.5.0alpha4
2013-01-22 09:42:04 +01:00
David Soria Parra
03ff2b301c
Fix NEWS
2013-01-22 09:41:53 +01:00
Stanislav Malyshev
92b5bdc231
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Merge fix of #62836 to ?.re, and regenerate ?.c
Fixed bug #64007 (There is an ability to create instance of Generator by hand).
- Fixed ZTS build
Class Name Resolution As Scalar Via "class" Keyword
2013-01-22 00:36:26 -08:00
Stanislav Malyshev
d78f5ababe
fix tests
2013-01-22 00:36:07 -08:00
Xinchen Hui
85fae636d0
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/standard/var_unserializer.c
2013-01-21 11:42:16 +08:00