09e73fd80e
Fix build problem in C++11
2013-01-30 19:08:45 +01:00
57438e5f77
Merge branch 'PHP-5.5'
...
* PHP-5.5:
having xz makes it three. thanks Mike Ford for spotting it
2013-01-30 17:40:57 +01:00
f0fe3d2dbe
having xz makes it three. thanks Mike Ford for spotting it
2013-01-30 17:39:13 +01:00
ee149cdd2b
Test commit (simple WS change)
2013-01-30 16:16:43 +01:00
c16d8c521e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
now we have also an xz archive
2013-01-30 14:13:31 +01:00
cbdf9ea34c
now we have also an xz archive
2013-01-30 14:12:38 +01:00
7ae80c585f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
forgot this file :(
2013-01-29 15:03:19 -08:00
15e76e6a98
forgot this file :(
2013-01-29 15:02:55 -08:00
ffbd93bdca
Merge branch 'PHP-5.5'
...
* PHP-5.5:
branched 5.4.12
update NEWS
2013-01-29 12:35:08 -08:00
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
09b6e33b40
branched 5.4.12
2013-01-29 12:33:45 -08:00
7a6e76fd2f
update NEWS
2013-01-29 12:31:49 -08:00
861c16d656
Merge branch 'PHP-5.5'
...
* PHP-5.5:
complete zts fix
2013-01-29 12:12:58 -08:00
748b37654d
complete zts fix
2013-01-29 12:12:34 -08:00
ac8fcecd5c
Merge branch 'PHP-5.5'
2013-01-29 19:50:44 +01:00
40dd32788c
Merge branch 'master' of git.php.net:/php-src
2013-01-29 19:50:25 +01:00
78d3e66f3a
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-29 19:50:14 +01:00
078b025a15
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2013-01-29 19:50:00 +01:00
1433854681
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-29 19:49:43 +01:00
264279439b
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-01-29 19:49:39 +01:00
ec53b60072
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2013-01-29 19:49:13 +01:00
93fd9c704b
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)
2013-01-29 19:47:45 +01:00
5198a860c7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed paramter count
Make converter work on VS
2013-01-29 19:20:15 +01:00
3bedc8ec27
Fixed paramter count
2013-01-29 19:19:51 +01:00
9d1bdaa569
Make converter work on VS
2013-01-29 19:19:49 +01:00
ae0c9d547d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
intl/converter in line w/ intl error handling
Fix zpp() call in intl/converter
Write local err on intlcal_get_time_zone() failure
Improve ERROR.CONVENTIONS
Fix arginfo of BreakIterator::getLocale
intl: doc explaining error conventions
Add UConverter class (ICU's UConverter API)
2013-01-29 19:12:14 +01:00
1da67fc65e
intl/converter in line w/ intl error handling
2013-01-29 19:06:15 +01:00
a721fe2b22
Fix zpp() call in intl/converter
2013-01-29 19:06:14 +01:00
ee6522bebf
Write local err on intlcal_get_time_zone() failure
2013-01-29 19:06:14 +01:00
363fd6d6fb
Improve ERROR.CONVENTIONS
2013-01-29 19:06:14 +01:00
b4ba46cb99
Fix arginfo of BreakIterator::getLocale
2013-01-29 19:06:14 +01:00
4badc0c071
intl: doc explaining error conventions
2013-01-29 19:06:14 +01:00
1faddd15d9
Add UConverter class (ICU's UConverter API)
...
RFC at http://wiki.php.net/rfc/uconverter
2013-01-29 19:05:14 +01:00
9307126fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed ZTS build
2013-01-29 09:27:09 -02:00
37c304b5db
- Fixed ZTS build
2013-01-29 09:26:54 -02:00
0ad8940814
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:29:11 -08:00
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
5382e156f9
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:27:35 -08:00
992bba6aef
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add news for bug #60524
Implemented Feature #60524 (sys_temp_dir)
Conflicts:
UPGRADING
2013-01-28 22:56:51 -08:00
389d41cc2e
Add news for bug #60524
2013-01-28 22:55:55 -08:00
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
383e317269
oops, unintended addition
2013-01-28 22:28:55 -08:00
24447dca5d
post-5.5 changes for bug #46439 as described in the RFC
2013-01-28 22:26:59 -08:00
1ca429e1d6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Implement fix for bug #46439 - add CURLFile class for safer uploads
Conflicts:
UPGRADING
2013-01-28 22:24:56 -08:00
a9d013bb02
Implement fix for bug #46439 - add CURLFile class for safer uploads
2013-01-28 22:22:59 -08:00
ba7544beb2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add new features
Conflicts:
UPGRADING
2013-01-28 12:14:56 -08:00
420bcc1a8e
add new features
2013-01-28 12:13:13 -08:00
4af8ceb3b2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
allow for libpng 1.5.x
2013-01-28 13:24:39 +01:00
263a220997
allow for libpng 1.5.x
2013-01-28 13:23:31 +01:00
59cc4d7679
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #60833 - self, parent, static behave inconsistently case-sensitive
Conflicts:
UPGRADING
2013-01-27 18:07:42 -08:00
Jelle Zijlstra