Commit Graph

76092 Commits

Author SHA1 Message Date
Dmitry Stogov
56eee05f66 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed references to "Zend Support"
2013-09-27 14:02:01 +04:00
Dmitry Stogov
80346690ba Removed references to "Zend Support" 2013-09-27 14:01:07 +04:00
Dmitry Stogov
3eba8cf673 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added support for GNU Hurd. (Svante Signell)

Conflicts:
	NEWS
2013-09-27 13:44:31 +04:00
Dmitry Stogov
f904830012 Added support for GNU Hurd. (Svante Signell) 2013-09-27 13:43:25 +04:00
Derick Rethans
9ef4e5d23d Merge branch 'PHP-5.5' 2013-09-27 10:14:51 +01:00
Derick Rethans
ea0f832f10 Merge branch 'PHP-5.4' into PHP-5.5 2013-09-27 10:14:47 +01:00
Derick Rethans
7a1a1aec8c - Updated to version 2013.6 (2013f) 2013-09-27 10:14:46 +01:00
Christopher Jones
5ac7c533a0 More OCI8 DTrace probe updates.
Change php.ini-* doc to match an earlier change to config.w32
2013-09-26 21:12:11 -07:00
Christopher Jones
8554800e76 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Don't track parameter number in separate znode
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
2013-09-26 21:07:57 -07:00
Stanley Sufficool
577b10b214 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
2013-09-26 20:16:28 -07:00
Stanley Sufficool
ac05cfb499 FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver 2013-09-26 19:53:47 -07:00
Stanley Sufficool
9aa904c375 Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/push/php-src: (140 commits)
  Copy dba_*() keys before converting to string.
  Fix the broken sh syntax in ext/imap/config.m4.
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
  Tinker with the wording of the short_open_tag description.
  Handle CLI server request headers case insensitively.
  5.4.21 now
  Typo....
  Add a XFAIL test for #64896
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
  ...
2013-09-26 19:52:01 -07:00
Sara Golemon
92fe33c570 Merge branch 'pull-request/473' 2013-09-26 13:24:08 -07:00
Nikita Popov
0ceea8a2e8 Don't track parameter number in separate znode
We already track it in the op array already.
2013-09-26 19:43:32 +02:00
Christopher Jones
eb8e63bd3c Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Implement variadic function syntax
2013-09-26 09:57:54 -07:00
Nikita Popov
0d7a638866 Implement variadic function syntax
As per RFC: https://wiki.php.net/rfc/variadics
2013-09-26 18:39:17 +02:00
ptarjan
361e984e46 fix missing change from 'tcp_socket' to the more common 'server' 2013-09-26 01:06:36 -07:00
ptarjan
ecbe4af0de fix many parallel test issues
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-09-26 00:30:23 -07:00
Christopher Jones
c02ff01548 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Added function opcache_compile_file() to load PHP scripts into cache without execution.
  Fixed issue #135 (segfault in interned strings if initial memory is too low)
2013-09-25 05:40:56 -07:00
Dmitry Stogov
6daa04a4f6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added function opcache_compile_file() to load PHP scripts into cache without execution.

Conflicts:
	NEWS
2013-09-25 12:15:01 +04:00
Dmitry Stogov
69454d9f0f Added function opcache_compile_file() to load PHP scripts into cache without execution. 2013-09-25 12:14:06 +04:00
Dmitry Stogov
4e249c8a93 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #135 (segfault in interned strings if initial memory is too low)

Conflicts:
	NEWS
2013-09-25 11:04:03 +04:00
Dmitry Stogov
dc8705c256 Fixed issue #135 (segfault in interned strings if initial memory is too low) 2013-09-25 11:02:39 +04:00
Christopher Jones
f4ce01864a Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
2013-09-24 05:40:53 -07:00
Adam Harvey
8d087dc0d7 Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
Fixes bug #65745 (Typo in commit 4a3936ef4a).
2013-09-23 13:30:47 -07:00
Christopher Jones
fad80daec5 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Make message and format arguments const char * to avoid build warning about invalid cast.
  Copy dba_*() keys before converting to string.
2013-09-23 05:41:25 -07:00
Remi Collet
c760ff1615 Merge branch 'PHP-5.5'
* PHP-5.5:
  Make message and format arguments const char * to avoid build warning about invalid cast.
2013-09-23 13:23:00 +02:00
Remi Collet
f7eff9cd41 Make message and format arguments const char * to avoid
build warning about invalid cast.
2013-09-23 13:21:57 +02:00
Adam Harvey
859b708722 Merge branch 'PHP-5.5'
* PHP-5.5:
  Copy dba_*() keys before converting to string.
2013-09-22 16:54:12 -07:00
Adam Harvey
a92a350cce Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Copy dba_*() keys before converting to string.
2013-09-22 16:52:41 -07:00
Adam Harvey
30e0442c54 Copy dba_*() keys before converting to string.
A nice Sunday afternoon project for somebody would be to refactor the dba
functions to use zend_parse_parameters() reliably and try to untangle some of
the macros in dba.c. Sadly, it is not a nice Sunday afternoon here.

Fixes bug #65708 (dba functions cast $key param to string in-place, bypassing
copy on write).
2013-09-22 16:46:17 -07:00
Christopher Jones
b3a17e53f3 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix the broken sh syntax in ext/imap/config.m4.
  Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
2013-09-20 17:10:16 -07:00
Adam Harvey
9e3bedcd73 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix the broken sh syntax in ext/imap/config.m4.
2013-09-20 14:21:28 -07:00
Adam Harvey
3f64d35559 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix the broken sh syntax in ext/imap/config.m4.
2013-09-20 14:19:01 -07:00
Adam Harvey
cc66eaa04b Fix the broken sh syntax in ext/imap/config.m4.
Patch by ryotakatsuki at gmail dot com. Fixes bug #65721 (configure script
broken in 5.5.4 and 5.4.20 when enabling imap).
2013-09-20 14:15:19 -07:00
Anatol Belski
ac562b027b Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
2013-09-20 16:01:11 +02:00
Anatol Belski
8f146c2bb0 Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
Patch by Pierre Renaudet
2013-09-20 15:59:33 +02:00
Christopher Jones
d135e08a98 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Added application/pdf to PHP CLI Web Server mime types.
2013-09-19 20:38:53 -07:00
Christopher Jones
b0a5e760fe Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  add note about request_body and php://input
2013-09-19 20:27:28 -07:00
Christopher Jones
dcafcd01a9 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added application/pdf to PHP CLI Web Server mime types.
2013-09-19 20:23:18 -07:00
Christopher Jones
dfa43d55dd Added application/pdf to PHP CLI Web Server mime types. 2013-09-19 20:22:50 -07:00
Christopher Jones
d879d3de1e Merge branch 'PHP-5.5'
* PHP-5.5:
2013-09-19 20:22:12 -07:00
Christopher Jones
6ee3472a5f Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner
# Via Michael Wallner
* 'master' of https://git.php.net/repository/php-src:
  add note about request_body and php://input
2013-09-19 10:53:22 -07:00
Michael Wallner
11d60447f9 add note about request_body and php://input 2013-09-19 15:41:04 +02:00
Christopher Jones
4f62df4f28 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Build OCI8 2.0 on Windows with Oracle Database 12c libraries only
2013-09-19 05:40:24 -07:00
Christopher Jones
b6d0cb0553 Build OCI8 2.0 on Windows with Oracle Database 12c libraries only 2013-09-18 19:50:32 -07:00
Christopher Jones
3d165224da Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner (18) and others
# Via David Soria Parra (8) and others
* 'master' of https://git.php.net/repository/php-src: (37 commits)
  better way to fix PRIu64 availability on windows
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix build - PRIu64 vs %I64u
  final bits
  we need to use the full stream wrapper for filters
  let the libsqlite3 symbols be exported in dll
  NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream
  Exclude bison 3.0 by Mike
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  upload2G note
  NEWS for #60577
  NEWS for bug #64441
  ...
2013-09-18 19:49:40 -07:00
Christopher Jones
c2b8a72673 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By David Soria Parra (6) and others
# Via David Soria Parra (5) and Michael Wallner (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
2013-09-18 19:49:36 -07:00
Christopher Jones
d5ba2d8a99 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By David Soria Parra (6) and others
# Via David Soria Parra
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
2013-09-18 19:49:30 -07:00
Christopher Jones
44ff556a82 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  better way to fix PRIu64 availability on windows
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 08:16:09 -07:00