Stanislav Malyshev
c0bfccafd2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:38:54 -07:00
Alexander Moskalev
b378b0b081
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:38:33 -07:00
Stanislav Malyshev
a89e71397d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:45:14 -07:00
root
e22c139fe0
Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:44:50 -07:00
Stanislav Malyshev
286c745d81
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Stricter libc-client symlink check
2013-08-24 21:40:52 -07:00
Ole Markus With
6b8dade6dc
Stricter libc-client symlink check
2013-08-24 21:40:26 -07:00
Joey Smith
2139d2702d
Expose fputcsv's escape_char to userland
...
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
2013-08-24 20:45:14 -07:00
Stanislav Malyshev
bdccf0a61d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
Update NEWS
2013-08-24 19:49:27 -07:00
Michael M Slusarz
3f9af558e7
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-24 19:45:54 -07:00
Anatol Belski
a2b1546f3b
ensure the test doesn't fail because of tz warning
2013-08-23 16:40:28 +02:00
Christopher Jones
c1ecdfbf6e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
2013-08-22 09:06:43 -07:00
Christopher Jones
7109f369e8
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-22 09:05:52 -07:00
Christopher Jones
18282f42c5
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
...
This reverts commit f38bd22ed2 .
2013-08-22 08:58:35 -07:00
Christopher Jones
f2ceb4963e
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
...
This reverts commit f38bd22ed2 .
2013-08-22 08:58:24 -07:00
Matteo Beccati
908da14bd1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed other compiler warnings
2013-08-22 15:34:11 +02:00
Matteo Beccati
d5987478a8
Fixed other compiler warnings
2013-08-22 15:33:54 +02:00
Nikita Popov
c0d99fd76a
Apply pgsql notice test fixes to PHP-5.5
2013-08-22 14:02:55 +02:00
Christopher Jones
11087eece7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
2013-08-21 15:43:19 -07:00
Christopher Jones
54d4a28003
Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
2013-08-21 15:39:14 -07:00
Christopher Jones
1af111dd68
Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
2013-08-21 15:37:02 -07:00
Christopher Jones
9895e8bbe6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:07:03 -07:00
Christopher Jones
f38bd22ed2
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:06:23 -07:00
Christopher Jones
d85827fb7f
Reduce compilation noise during normal compilation:
...
php-5.5/ext/session/session.c:836: warning: unused variable ‘struc’
php-5.5/ext/session/session.c:836: warning: unused variable ‘num_key’
php-5.5/ext/session/session.c:836: warning: unused variable ‘key_length’
php-5.5/ext/session/session.c:836: warning: unused variable ‘key’
php-5.5/ext/session/session.c:835: warning: unused variable ‘key_type’
php-5.5/ext/session/session.c:834: warning: unused variable ‘_ht’
php-5.5/ext/session/session.c:857: warning: unused variable ‘has_value’
php-5.5/ext/session/session.c:856: warning: unused variable ‘namelen’
php-5.5/ext/session/session.c:853: warning: unused variable ‘name’
php-5.5/ext/session/session.c:852: warning: unused variable ‘p’
php-5.5/ext/session/mod_user.c:191: warning: unused variable ‘ret’
2013-08-21 10:34:09 -07:00
Michael Wallner
6181948592
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:11 +02:00
Michael Wallner
d8023d13eb
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:17:22 +02:00
Anthony Ferrara
83e3466898
Fix return types of password API helper functions.
...
This fixes issues that were found during static analysis by cjones where failure was impossible to detect due to return type mangling (casting an int to a char, then comparing to an int).
2013-08-21 12:10:40 -04:00
Matteo Beccati
4283f75c34
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed compiler warnings in ext/pgsql
Fixed other compiler warnings in PDO_PGSQL
Fixed compiler warning
2013-08-21 11:24:27 +02:00
Matteo Beccati
540f325664
Fixed compiler warnings in ext/pgsql
2013-08-21 11:24:12 +02:00
Matteo Beccati
696852f2bd
Fixed other compiler warnings in PDO_PGSQL
2013-08-21 11:22:33 +02:00
Matteo Beccati
5c06e5c2e0
Fixed compiler warning
...
I moved the constant to the enum in order to avoid this:
ext/pgsql/pgsql.c:3491: warning: comparison is always false due to limited range of data type
Works in gcc 4.6, but I'm not sure about other compilers.
2013-08-21 11:22:32 +02:00
Yasuo Ohgaki
c51f77fe83
Add php_serialize session.serialize_handler. This patch closes
...
Request #25630
Request #43980
Request #54383
Bug #65359
and many others similar to these that are closed as "wont fix" or
"not a bug".
Current serializers have limitations due to register_globals support
that are no longer supported. Changing existing serializer may cause
compatibility issue. Therefore, new handler is needed to remove
needless limitations.
php_serialize does not have special characters and allow numerical
index in $_SESSION. $_SESSION can be used as ordinary array.
2013-08-21 10:51:51 +09:00
Yasuo Ohgaki
1641158644
Fixed Bug #65475
2013-08-21 08:11:59 +09:00
Christopher Jones
268c2884fa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Quash compile warning "warning: 'flags' may be used uninitialized in this function"
2013-08-20 13:37:02 -07:00
Christopher Jones
e9b12bedc3
Quash compile warning "warning: 'flags' may be used uninitialized in this function"
2013-08-20 13:36:18 -07:00
Christopher Jones
9e1e0096d1
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 11:26:57 -07:00
Christopher Jones
9c9fee3f43
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 11:26:49 -07:00
Christopher Jones
433225a929
Remove compilation warning "warning: no newline at end of file"
2013-08-20 11:04:26 -07:00
Christopher Jones
ec3f8d2b1f
Remove compilation warnings: "warning: no newline at end of file"
2013-08-20 11:01:20 -07:00
Christopher Jones
dfb187752e
Fix compile warning "intl_cppshims.h:34:7: warning: no newline at end of file"
2013-08-20 10:55:10 -07:00
Christopher Jones
db0166af2f
Tabify
2013-08-20 10:46:15 -07:00
Christopher Jones
0ab8475db2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"
2013-08-20 10:42:20 -07:00
Christopher Jones
d82f9339fe
Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
2013-08-20 10:41:29 -07:00
Christopher Jones
eba85f91d8
Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"
2013-08-20 10:41:01 -07:00
Christopher Jones
7160adf4ad
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove some compilation warnings: 'unused variable' and 'enumeration value not handled in switch'
2013-08-20 10:34:13 -07:00
Christopher Jones
b455ba971c
Remove some compilation warnings:
...
'unused variable' and
'enumeration value not handled in switch'
2013-08-20 10:33:00 -07:00
Michael Wallner
7f3e7eb958
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64953 (Postgres prepared statement positional parameter casting)
Conflicts:
ext/pdo/pdo_sql_parser.c
2013-08-20 19:21:53 +02:00
Michael Wallner
27c803aaed
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 19:19:02 +02:00
Christopher Jones
1a00b9bd26
Remove compile warning:
...
warning: unused variable ‘j’ [-Wunused-variable]
2013-08-19 17:58:42 -07:00
Christopher Jones
83469477e7
Remove compile warnings:
...
warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
2013-08-19 17:48:46 -07:00
Christopher Jones
f69a5c520f
Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
2013-08-19 17:46:50 -07:00