Pierre Joye
eaec5522ff
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix #64725 , wrong res check
2013-04-27 17:52:38 +02:00
Pierre Joye
25c9f34c9c
fix #64725 , wrong res check
2013-04-27 17:52:30 +02:00
Pierre Joye
bba7f8aa31
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- #64710 , check return val
- #64710 , kill unused var
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , Implicit declaration
2013-04-26 08:16:02 +02:00
Pierre Joye
2809afa119
- #64710 , check return val
2013-04-26 08:15:33 +02:00
Pierre Joye
7bd20354a8
- #64710 , kill unused var
2013-04-26 08:15:05 +02:00
Pierre Joye
b0afef2d5e
#64710 , kill unused vars
2013-04-26 08:10:24 +02:00
Pierre Joye
685a6d9aab
#64710 , kill unused vars
2013-04-26 08:09:19 +02:00
Pierre Joye
7b06189702
#64710 , kill unused vars
2013-04-26 08:08:38 +02:00
Pierre Joye
3fffc78ed0
#64710 , kill unused vars
2013-04-26 08:07:47 +02:00
Pierre Joye
b5902b6c9d
#64710 , kill unused vars
2013-04-26 08:06:34 +02:00
Pierre Joye
afe46d4d47
#64710 , Implicit declaration
2013-04-26 07:48:11 +02:00
Pierre Joye
fde3198daa
Merge branch 'master' of git.php.net:php-src
2013-04-26 06:40:42 +02:00
Matt Ficken
d35822b4fa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Adding sys_get_temp_dir() test specific for Windows.
2013-04-25 14:55:50 -07:00
Matt Ficken
4941e3fe44
Adding sys_get_temp_dir() test specific for Windows.
...
sys_get_temp_dir() returns a Windows-style path (\\ instead of /) on
Windows. This is why a Windows specific test is required.
Skipping req60524.phpt on Windows. Adding -win32 fork for use only on
Windows.
Fixes test bug #64396 .
2013-04-25 14:52:48 -07:00
Anatol Belski
df236828b5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed float precision change under Windows x64
2013-04-25 23:01:13 +02:00
Anatol Belski
30802dbc55
Fixed float precision change under Windows x64
...
otherwise we'll have asserts in debug builds and void runs of the
error handlers in non debug builds.
2013-04-25 22:44:29 +02:00
Matt Ficken
67a72ceb93
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix Test Bug #64714
2013-04-25 11:37:36 -07:00
Matt Ficken
7d0dd957eb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix Test Bug #64714
2013-04-25 11:37:25 -07:00
Matt Ficken
5adf1be45d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix Test Bug #64714
2013-04-25 11:37:09 -07:00
Matt Ficken
bf5506f511
Fix Test Bug #64714
2013-04-25 11:34:57 -07:00
Johannes Schlüter
488933792a
Merge branch 'PHP-5.5'
2013-04-25 18:05:56 +02:00
Johannes Schlüter
6251706ea6
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-25 18:05:40 +02:00
Johannes Schlüter
239ba8d58b
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
configure.in
main/php_version.h
2013-04-25 18:05:19 +02:00
Johannes Schlüter
63434524f8
PHP 5.3.26 this will be
2013-04-25 18:02:53 +02:00
Johannes Schlüter
671ef9fda7
Fix NEWS
2013-04-25 17:58:02 +02:00
David Soria Parra
4a52fe4755
NEWS for RC1
2013-04-25 08:05:56 +02:00
David Soria Parra
51e3fabf10
NEWS for PHP 5.5.0 Beta 4 again
2013-04-25 08:05:16 +02:00
David Soria Parra
e04baf692a
Fix curl build on windows
2013-04-25 08:04:30 +02:00
Remi Collet
182fef46a9
Fixed bug #64707 missing declaration after dd0399f
2013-04-25 06:40:55 +02:00
Pierrick Charron
f42a257711
Update NEWS file
2013-04-24 13:26:34 -04:00
Stanislav Malyshev
cf9db2154e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.16-dev
Conflicts:
configure.in
main/php_version.h
2013-04-24 10:16:56 -07:00
Stanislav Malyshev
a58a279d7b
5.4.16-dev
2013-04-24 10:15:35 -07:00
Remi Collet
26bd2cba81
gd: missing headers in previous
2013-04-24 16:15:42 +02:00
Remi Collet
3a8ceed844
allow use of gdImageCreateFromJpegEx with system libgd
2013-04-24 16:15:11 +02:00
Remi Collet
dd0399f5c6
We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
...
The new (Ex) functions are used with the new ignore_warning parameter
The standard functions are used in _php_image_create_from_string,
sent as a function pointer, and call without this optional parameter.
2013-04-24 16:07:50 +02:00
Remi Collet
7189cc5be8
gd: fix proto comment
2013-04-24 14:44:20 +02:00
Anatol Belski
eb4065b9e1
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-24 14:36:57 +02:00
Remi Collet
aa4b0af20f
gd: provide imageflip with system libgd when available
2013-04-24 14:32:03 +02:00
Anatol Belski
8d41f6dab6
Removed fork of ext/zlib/tests/bug_52944.phpt
...
The real issue is a bug in asm zlib build, reported here
https://github.com/madler/zlib/issues/41 . Non ASM builds
behave more predictable.
2013-04-24 14:31:59 +02:00
David Soria Parra
ee65e6953f
NEWS for RC 1
2013-04-24 12:39:44 +02:00
David Soria Parra
78c79a2d5b
NEWS for beta 4
2013-04-24 12:37:07 +02:00
ptarjan
22f6b6dbec
Fix zlib/tests/gzseek to create unique temporary files
...
When running tests in parallel these create a race condition.
Race conditions are bad.
2013-04-24 01:06:55 -07:00
David Soria Parra
4c0746228d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for RC1
NEWS for PHP 5.5.0 Beta 4 again
Fix curl build on windows
2013-04-25 08:25:10 +02:00
Remi Collet
b0cf340eef
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64707 missing declaration after dd0399f
2013-04-25 06:41:01 +02:00
Pierrick Charron
dec5324d5e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update NEWS file
2013-04-24 13:27:06 -04:00
Stanislav Malyshev
aa2b3a4b31
Merge branch 'PHP-5.5'
...
* PHP-5.5:
5.4.16-dev
2013-04-24 10:17:11 -07:00
Remi Collet
e12abebf50
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: missing headers in previous
allow use of gdImageCreateFromJpegEx with system libgd
2013-04-24 16:16:25 +02:00
Remi Collet
5897696a02
Merge branch 'PHP-5.5'
...
* PHP-5.5:
We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
gd: fix proto comment
2013-04-24 16:11:34 +02:00
Remi Collet
7264179eef
gd: fix proto comment
2013-04-24 14:43:59 +02:00
Anatol Belski
d07b7c2fc0
Merge branch 'master' of git.php.net:php-src
2013-04-24 14:36:41 +02:00
