Gustavo André dos Santos Lopes
8ee8ccda19
Merge branch '5.3' into 5.4
...
Conflicts:
sapi/fpm/fpm/fpm_main.c
2012-05-23 13:27:21 +02:00
Gustavo André dos Santos Lopes
1eff3b01b8
Fixed bug #6208 : memory leak in grapheme_extract()
2012-05-23 13:25:45 +02:00
Gustavo André dos Santos Lopes
86ea921291
Fixed bug #62082
...
This was a buffer overflow in internal function
get_icu_disp_value_src_php().
2012-05-23 13:25:42 +02:00
Gustavo André dos Santos Lopes
07c0d714a5
Fixed bug #62081
...
Constructor of IntlDateFormatter would leak if called twice.
Made calling it more than once error out before starting
using resources.
2012-05-23 13:25:37 +02:00
Gustavo André dos Santos Lopes
51286bd8e5
Fixed bug #62070
...
Collator::getSortKey() was returning an unterminated string
due the length given to RETURN_STRINGL being off by one.
2012-05-23 13:25:32 +02:00
Jerome Loyet
1299503936
- Fixed bug #61026 (FPM pools can listen on the same address)
2012-05-23 11:53:04 +02:00
Jerome Loyet
5d61e56dd7
- Fixed bug #61026 (FPM pools can listen on the same address)
2012-05-23 11:52:04 +02:00
Jerome Loyet
d236c1af8a
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Fix bug #62112 : number_format() is not binary safe
2012-05-23 11:41:29 +02:00
Jerome Loyet
0b44f16ea2
- Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)
2012-05-23 11:40:22 +02:00
Gustavo André dos Santos Lopes
3e62aae1b4
Fix bug #62112 : number_format() is not binary safe
...
The bug report actually urges PHP 5.3's behavior to be
reinstated -- that is, make "\0", when used as a separator,
be the same as no separator at all. I believe that is not a
proper course of action and that "\0" being interpreted as
no seperator was a bug in PHP 5.3.
Using "" for no separator, in both 5.3 and 5.4, before and
after this change, causes no separator to be used, so
there is no functionality loss.
2012-05-23 11:37:27 +02:00
Jerome Loyet
a07d76c0ba
- Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
2012-05-23 11:31:33 +02:00
Jerome Loyet
812d248193
- Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
2012-05-23 11:30:27 +02:00
Jerome Loyet
f4c38016b6
- Fix help message for '-R'
2012-05-23 10:36:45 +02:00
Jerome Loyet
757e3fc3d5
- fix help message for '-R'
2012-05-23 10:35:37 +02:00
Jerome Loyet
629273d11b
- add missing help message for '-R'
2012-05-23 10:34:16 +02:00
Jerome Loyet
06c7c3674b
- Fixed bug #61835 (php-fpm is not allowed to run as root)
2012-05-23 10:32:42 +02:00
Jerome Loyet
7b396c078c
- Fixed bug #61835 (php-fpm is not allowed to run as root)
2012-05-23 09:49:13 +02:00
Xinchen Hui
8475c5b98d
Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
2012-05-23 13:52:36 +08:00
Xinchen Hui
5b8316188c
Revert NEWS
2012-05-23 13:52:18 +08:00
Xinchen Hui
df481764f3
Revert "Implemented FR #61602 Allow access to name of constant used as default value"
...
This reverts commit 054f3e3ce5
.
See: http://news.php.net/php.cvs/69137 and the author confirmed.
Will commit later after the author fixed this then make a new PR.
Conflicts:
ext/reflection/php_reflection.c
2012-05-23 13:50:12 +08:00
Xinchen Hui
f733173b1f
Fix typo while resolving conflicts
2012-05-23 13:43:49 +08:00
Xinchen Hui
a7df6ce664
Revert "Implemented FR #61602 Allow access to name of constant used as default value"
...
This reverts commit 054f3e3ce5
.
See: http://news.php.net/php.cvs/69137 and the author confirmed.
Will commit later after the author fixed this then make a new PR.
Conflicts:
ext/reflection/php_reflection.c
2012-05-23 13:39:00 +08:00
Anatoliy Belsky
29876c5c29
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #62109 tests\basic\bug46313-win.phpt fails
- Fixed bug #61045 (fpm don't send error log to fastcgi clients)
2012-05-22 18:43:10 +02:00
Anatoliy Belsky
621fddab93
Fix bug #62109 tests\basic\bug46313-win.phpt fails
2012-05-22 18:41:03 +02:00
Jerome Loyet
bdf0c9ccbe
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
add news for new pg_ functions
2012-05-22 08:47:40 +02:00
Jerome Loyet
dce259099d
- Fixed bug #61045 (fpm don't send error log to fastcgi clients)
2012-05-22 08:40:37 +02:00
Jerome Loyet
d1e529c1cb
- fix NEWS for bug #61812
2012-05-22 08:38:09 +02:00
Jerome Loyet
faca4e08b4
- Fixed bug #61045 (fpm don't send error log to fastcgi clients)
2012-05-22 08:34:27 +02:00
Stanislav Malyshev
a472649016
add news for new pg_ functions
2012-05-21 16:15:12 -07:00
Felipe Pena
074d361d64
- Fix the fix (typo s/AIX/_AIX/g)
2012-05-21 08:54:59 -03:00
Xinchen Hui
4c9a11c857
Use free instead of efree
2012-05-21 19:02:45 +08:00
Xinchen Hui
bbcea230e1
Use emalloc instead of malloc
2012-05-21 18:58:19 +08:00
Anatoliy Belsky
fbb86bd7b3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #62066 Test Bug - ext/tidy/tests/004.phpt
2012-05-21 12:52:10 +02:00
Matt Ficken
c973fef48d
Fix bug #62066 Test Bug - ext/tidy/tests/004.phpt
2012-05-21 12:51:24 +02:00
Anatoliy Belsky
77e70b391c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62068 Test bug - gmp_nextprime and 022
Fix: 62067 Moved comments to FILE section
- BFN
Conflicts:
NEWS
2012-05-21 12:37:59 +02:00
Matt Ficken
645d65f3e3
Fixed bug #62068 Test bug - gmp_nextprime and 022
2012-05-21 12:31:16 +02:00
Dmitry Stogov
2ae8d2fbfb
Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution)
2012-05-21 13:57:41 +04:00
Dmitry Stogov
c8f47a8e7c
Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution)
2012-05-21 13:46:07 +04:00
Felipe Pena
c5fcd9f5af
- BFN
2012-05-20 19:41:15 -03:00
Felipe Pena
ffe8303f24
- Fixed bug #62025 (__ss_family was changed on AIX 5.3)
2012-05-20 19:37:20 -03:00
zoe slattery
867447f420
Fix: 62067 Moved comments to FILE section
2012-05-19 16:34:16 +01:00
zoe slattery
778d69ddfe
Fix: 62067 Moved comments to FILE section
2012-05-19 16:33:36 +01:00
Felipe Pena
c9331a3ef2
- BFN
2012-05-18 21:26:24 -03:00
Felipe Pena
79d52503a4
- BFN
2012-05-18 19:38:02 -03:00
Felipe Pena
88275e547f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #62064 (memory leak in the XML Writer module)
2012-05-18 19:23:42 -03:00
Felipe Pena
6d928fd26d
- Fixed bug #62064 (memory leak in the XML Writer module)
2012-05-18 19:23:29 -03:00
Christopher Jones
29a85d49ae
Dummy (whitespace) change so Dan Brown can verify snap generation from git
...
PHP snapshots were still pulling from SVN and were out of date. This
is a dummy PHP 5.4-only commit so Dan can verify what he's updated for
git in the backend.
2012-05-16 10:13:34 -07:00
Johannes Schlüter
89e7a195bc
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
PHP 5.3.15-dev
Conflicts:
configure.in
main/php_version.h
2012-05-16 16:50:33 +02:00
Johannes Schlüter
72a9b595ca
PHP 5.3.15-dev
2012-05-16 16:49:35 +02:00
Johannes Schlüter
67039363cd
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
...
* 'PHP-5.3' of git.php.net:/php-src:
Fix for bug#62046
2012-05-16 16:46:08 +02:00