Anatoliy Belsky
64d7297506
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Enabled apache 2.4 handler build option
2012-11-13 19:48:34 +01:00
Anatoliy Belsky
117d2dd688
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Enabled apache 2.4 handler build option
Conflicts:
sapi/apache2handler/config.w32
2012-11-13 19:40:22 +01:00
Pierre Joye
019bdff395
Enabled apache 2.4 handler build option
2012-11-13 19:34:00 +01:00
David Soria Parra
217020788a
Build .xz archive during makedist
2012-11-13 17:09:29 +01:00
David Soria Parra
f4512d01a0
NEWS: remove dots at the end of the NEWS file
2012-11-13 17:08:49 +01:00
David Soria Parra
727b6775ef
PHP-5.5 is open
2012-11-13 17:08:49 +01:00
David Soria Parra
7e565acca1
Add missing parts from UPGRADING to NEWS
2012-11-13 17:08:49 +01:00
Anatoliy Belsky
bc9f8030c7
Fixed sockets ext build on win
2012-11-13 14:53:32 +01:00
Derick Rethans
dae05b2973
Merge branch 'PHP-5.4'
2012-11-13 10:17:21 +00:00
Derick Rethans
4f36aeb120
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
NEWS
2012-11-13 10:16:58 +00:00
Derick Rethans
00ad4c0e6a
- Updated to version 2012.10 (2012j)
2012-11-13 10:15:34 +00:00
Derick Rethans
1e081a825e
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2012-11-13 10:10:41 +00:00
Derick Rethans
d9aea7cd4d
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2012-11-13 10:10:28 +00:00
Derick Rethans
97f39ee1d7
Merge branch 'master' of git.php.net:/php-src
2012-11-13 10:10:10 +00:00
Gustavo Lopes
acbc6d182b
List ext/intl changes also in NEWS
2012-11-12 19:16:12 +01:00
Adam Harvey
0b96b4c4e9
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Update arginfo for preg_match_all() to reflect reality.
fix invalid read when trimming empty string
2012-11-12 20:09:18 +08:00
Adam Harvey
6b9df7a454
Merge branch 'preg_match_all_arginfo' into PHP-5.4
...
* preg_match_all_arginfo:
Update arginfo for preg_match_all() to reflect reality.
2012-11-12 20:08:01 +08:00
Adam Harvey
bca8ff723d
Update arginfo for preg_match_all() to reflect reality.
...
Back when I implemented FR #53238 during the 5.4 development phase to make the
$matches parameter optional in preg_match_all(), it turns out I forgot to
update the arginfo to note that only 2 parameters are now required by
preg_match_all(). The function itself works fine, but reflection was reporting
the wrong number of required parameters.
2012-11-12 20:04:26 +08:00
Bernhard K. Weisshuhn
180767373d
make failed tests fail the test target
...
I don't see any reason to ignore failed tests. This makes it
unnecessarily difficult to use ci, also for module builds.
2012-11-11 20:11:06 +01:00
Antony Dovgal
4029475e82
fix invalid read when trimming empty string
2012-11-11 22:38:18 +04:00
Antony Dovgal
5b82fb52fd
fix invalid read when trimming empty string
2012-11-11 22:38:14 +04:00
Antony Dovgal
bb60122c2f
fix invalid read when trimming empty string
2012-11-11 22:37:04 +04:00
Felipe Pena
065862a750
- BFN
2012-11-09 21:28:30 -02:00
Felipe Pena
80682bdcd8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
2012-11-09 21:24:05 -02:00
Felipe Pena
964acdaa35
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
2012-11-09 21:23:10 -02:00
Felipe Pena
44a6fe8411
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
2012-11-09 21:22:27 -02:00
Johannes Schlüter
e383d4d20d
Merge branch 'PHP-5.4'
2012-11-08 00:04:08 +01:00
Johannes Schlüter
9d95f7d286
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
configure.in
main/php_version.h
2012-11-08 00:03:37 +01:00
Johannes Schlüter
417b1b238f
This will be PHP 5.3.20
2012-11-08 00:01:43 +01:00
Stanislav Malyshev
63307de7b6
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix NEWS
2012-11-07 01:19:20 -08:00
Stanislav Malyshev
3e7fcd9cab
fix NEWS
2012-11-07 01:18:34 -08:00
Xinchen Hui
b936a815fb
Merge branch 'PHP-5.4'
2012-11-07 17:09:27 +08:00
Xinchen Hui
e222837f6e
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-07 17:08:34 +08:00
Xinchen Hui
7fcbe4d546
Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
2012-11-07 17:05:24 +08:00
Xinchen Hui
6ef09012aa
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-06 14:14:55 +08:00
Rasmus Lerdorf
0ee5d18f91
News entry for png memleak fix
2012-11-05 21:06:18 -08:00
Rasmus Lerdorf
7caca1614b
News entry for png memleak fix
2012-11-05 21:04:33 -08:00
Rasmus Lerdorf
a983ded9bd
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2012-11-05 20:58:04 -08:00
Rasmus Lerdorf
f8c280d85a
These need to be volatile in order to prevent leaking after the
...
longjmp in the error handler
2012-11-05 20:57:15 -08:00
Rasmus Lerdorf
f452b9056e
These need to be volatile in order to prevent leaking after the
...
longjmp in the error handler
2012-11-05 20:57:07 -08:00
Rasmus Lerdorf
261e32f623
These need to be volatile in order to prevent leaking after the
...
longjmp in the error handler
2012-11-05 20:56:19 -08:00
Derick Rethans
37cc133d6f
Merge branch 'PHP-5.4'
2012-11-04 16:24:07 +00:00
Derick Rethans
db0f623490
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-04 16:24:02 +00:00
Derick Rethans
1784279be0
- Updated to version 2012.9 (2012i)
2012-11-04 16:23:58 +00:00
Xinchen Hui
7bcb8780e0
Fixed bug #63428 (The behavior of execute() changed)
2012-11-04 12:48:35 +08:00
Xinchen Hui
3c6b0db052
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
Xinchen Hui
6dbf431541
Merge branch 'PHP-5.4'
2012-11-02 18:57:56 +08:00
Xinchen Hui
153bfada90
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-02 18:56:17 +08:00
Xinchen Hui
3fe3029ecb
Fixed bug #62444 (Handle leak in is_readable on windows).
2012-11-02 18:53:06 +08:00
Anatoliy Belsky
ab1429dd43
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63241 PHP fails to open Windows deduplicated files.
Conflicts:
NEWS
2012-10-31 23:01:09 +01:00
