Daniel Lowrey
fb2314798e
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/openssl/xp_ssl.c
2015-02-09 11:44:09 -05:00
Daniel Lowrey
f2b12424c0
NEWS
2015-02-09 11:42:40 -05:00
Daniel Lowrey
1eef4f2a0c
Miscellaneous cleanup
2015-02-09 11:42:17 -05:00
Daniel Lowrey
a8cb1d2b85
Merge branch 'PHP-5.5' of github.com:bbroerman30/php-src into PHP-5.5
2015-02-09 11:40:04 -05:00
Xinchen Hui
3d1ec33f96
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-09 11:32:32 +08:00
Xinchen Hui
d078c59ed9
Merge branch 'improve-bug67436' of https://github.com/reeze/php-src into PHP-5.5
2015-02-09 11:31:59 +08:00
Bob Weinand
fc444fbc70
Shut up, my lovely compiler; I do not like your warnings
...
Conflicts:
Zend/zend_object_handlers.c
2015-02-09 11:23:35 +08:00
Anatol Belski
979020fcad
moved the part of the test into an appropriate place
2015-02-08 14:10:52 +01:00
Anatol Belski
ffdc2c4123
Merge branch 'pull-request/1060' into PHP-5.6
2015-02-08 12:33:15 +01:00
manuel
cc13d8696f
Fix another invalid free of CG(interned_empty_string)
...
Fixes #68214
2015-02-07 19:17:31 +01:00
manuel
3550cc5fd9
add tests for #68996
2015-02-07 18:52:26 +01:00
George Wang
c90cd09331
Fixed #68790 (Missing return)
2015-02-07 12:19:53 -05:00
George Wang
c892127f76
Fixed #68790 (Missing return)
2015-02-07 12:18:42 -05:00
Reeze Xia
4d034b1a1e
Improve tests for bug 67436
...
I always use a.php or b.php for local testing,
this diff makes the test more stable
2015-02-07 14:11:09 +08:00
Anatol Belski
464667153d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix setting default ODBCVER value in config.w32
2015-02-06 19:59:55 +01:00
Anatol Belski
9bf95d8291
fix setting default ODBCVER value in config.w32
2015-02-06 19:59:14 +01:00
Anatol Belski
e6d16c0956
updated NEWS
2015-02-06 19:39:32 +01:00
Anatol Belski
4266f5b1c4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
2015-02-06 19:39:10 +01:00
Anatol Belski
f4319a4f73
updated NEWS
2015-02-06 19:37:01 +01:00
Anatol Belski
e46e208819
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
2015-02-06 19:05:13 +01:00
Anatol Belski
a41aa46759
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
...
This is done in two steps:
- the ODBCVER has to be rased to 0x0300 which corresponds to Sql
Server 9, otherwise the client will not recognize several SQL
datatypes
- additionally the config scripts was tweaked so then ODBCVER
can be overridden, that still allows enabling compatibility
with lower versions
Bug #67437 might be fixed by this as well.
2015-02-06 19:00:27 +01:00
manuel
13fc7f20a4
Invalid free of CG(interned_empty_string)
...
On failure php_escape_html_entities returns STR_EMPTY_ALLOC which is an
alias of CG(interned_empty_string) if interned strings are enabled.
Make sure we don't free this.
2015-02-06 16:53:01 +01:00
Anatol Belski
63761ab91e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Removed erroneous condition
2015-02-06 09:42:41 +01:00
Anatol Belski
9ef0c39b2b
Removed erroneous condition
...
This condition is always false. Furthermore headers_list() is
documented to always return an array.
2015-02-06 09:41:02 +01:00
Stanislav Malyshev
af23980de7
turn off online tests, they fail too often on CI
2015-02-05 22:05:36 -08:00
Stanislav Malyshev
57ba83d4e0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix tests
2015-02-05 21:56:26 -08:00
Stanislav Malyshev
928fdbea08
fix tests
2015-02-05 21:54:47 -08:00
Stanislav Malyshev
a1c28567c6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update header handling to RFC 7230
2015-02-05 20:10:09 -08:00
Stanislav Malyshev
067340bbc8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update header handling to RFC 7230
2015-02-05 20:09:13 -08:00
Stanislav Malyshev
f001c63073
Update header handling to RFC 7230
2015-02-05 20:08:12 -08:00
Stanislav Malyshev
2c386b55f2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test to not hit php.net
2015-02-05 00:41:55 -08:00
Stanislav Malyshev
d33f4c6eb8
fix test to not hit php.net
2015-02-05 00:41:51 -08:00
Stanislav Malyshev
10b15f0f8b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Conflicts: main/streams/memory.c
2015-02-05 00:41:35 -08:00
Xinchen Hui
ae90010891
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/streams/memory.c
2015-02-05 16:33:20 +08:00
Nayana Hettiarachchi
5446377c6b
Conflicts:
...
main/streams/memory.c
2015-02-05 16:32:30 +08:00
Stanislav Malyshev
ee864f3301
fix test to not hit php.net
2015-02-05 00:11:44 -08:00
Julien Pauli
a79f332333
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2015-02-04 17:45:38 +01:00
Julien Pauli
959cecf046
Updated NEWS
2015-02-04 17:43:36 +01:00
Julien Pauli
583af4979b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
2015-02-04 17:39:34 +01:00
Julien Pauli
f51b73c833
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
...
This reverts commit 8e19705a93
.
2015-02-04 17:39:16 +01:00
Julien Pauli
421d309908
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.23 now
Conflicts:
configure.in
main/php_version.h
2015-02-04 17:32:46 +01:00
Julien Pauli
e6ea244004
5.6.7 now
2015-02-04 16:37:49 +01:00
Julien Pauli
b86529f751
5.5.23 now
2015-02-04 16:35:32 +01:00
Brad Broerman
dddbe0fc33
Update xp_ssl.c
...
Added TSRMLS_CC to php_openssl_sockop_io calls.
2015-02-04 10:13:36 -05:00
Julien Pauli
93315c4e1d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "json_decode() should generate a syntax error when given ""."
Update NEWS
2015-02-04 12:48:57 +01:00
Julien Pauli
c85f12e3ac
Revert "json_decode() should generate a syntax error when given ""."
...
This reverts commit a7b3abe4e6
.
2015-02-04 12:48:17 +01:00
Michael Wallner
4c3b4dc74a
make buildconf work as expected;
...
autoconf really needs some help with all those external m4s
2015-02-04 09:39:02 +01:00
Xinchen Hui
1bb7647c6e
Fixed indent
2015-02-03 23:24:34 +08:00
Yasuo Ohgaki
bffdc4c37e
Update NEWS
2015-02-03 19:48:53 +09:00
Yasuo Ohgaki
539fd65915
Update NEWS
2015-02-03 19:45:20 +09:00