]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 27 Sep 2013 04:07:57 +0000 (21:07 -0700)]
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

11 years agoMerge branch 'pull-request/473'
Sara Golemon [Thu, 26 Sep 2013 20:24:08 +0000 (13:24 -0700)]
Merge branch 'pull-request/473'

11 years agoDon't track parameter number in separate znode
Nikita Popov [Thu, 26 Sep 2013 17:43:32 +0000 (19:43 +0200)]
Don't track parameter number in separate znode

We already track it in the op array already.

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Thu, 26 Sep 2013 16:57:54 +0000 (09:57 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Implement variadic function syntax

11 years agoImplement variadic function syntax
Nikita Popov [Thu, 26 Sep 2013 16:39:17 +0000 (18:39 +0200)]
Implement variadic function syntax

As per RFC: https://wiki.php.net/rfc/variadics

11 years agofix missing change from 'tcp_socket' to the more common 'server'
ptarjan [Thu, 26 Sep 2013 08:06:36 +0000 (01:06 -0700)]
fix missing change from 'tcp_socket' to the more common 'server'

11 years agofix many parallel test issues
ptarjan [Thu, 26 Sep 2013 07:18:05 +0000 (00:18 -0700)]
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.

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Wed, 25 Sep 2013 12:40:56 +0000 (05:40 -0700)]
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)

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Wed, 25 Sep 2013 08:15:01 +0000 (12:15 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added function opcache_compile_file() to load PHP scripts into cache without execution.

Conflicts:
NEWS

11 years agoAdded function opcache_compile_file() to load PHP scripts into cache without execution.
Dmitry Stogov [Wed, 25 Sep 2013 08:14:06 +0000 (12:14 +0400)]
Added function opcache_compile_file() to load PHP scripts into cache without execution.

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Wed, 25 Sep 2013 07:04:03 +0000 (11:04 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed issue #135 (segfault in interned strings if initial memory is too low)

Conflicts:
NEWS

11 years agoFixed issue #135 (segfault in interned strings if initial memory is too low)
Dmitry Stogov [Wed, 25 Sep 2013 07:02:39 +0000 (11:02 +0400)]
Fixed issue #135 (segfault in interned strings if initial memory is too low)

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Tue, 24 Sep 2013 12:40:53 +0000 (05:40 -0700)]
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.

11 years agoFix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
Adam Harvey [Mon, 23 Sep 2013 20:30:47 +0000 (13:30 -0700)]
Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.

Fixes bug #65745 (Typo in commit 4a3936ef4abdeb72c7d323fe4b6a65e1ae0ef181).

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Mon, 23 Sep 2013 12:41:25 +0000 (05:41 -0700)]
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.

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Mon, 23 Sep 2013 11:23:00 +0000 (13:23 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Make message and format arguments const char * to avoid build warning about invalid cast.

11 years agoMake message and format arguments const char * to avoid
Remi Collet [Mon, 23 Sep 2013 11:21:57 +0000 (13:21 +0200)]
Make message and format arguments const char * to avoid
build warning about invalid cast.

11 years agoMerge branch 'PHP-5.5'
Adam Harvey [Sun, 22 Sep 2013 23:54:12 +0000 (16:54 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Copy dba_*() keys before converting to string.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Sun, 22 Sep 2013 23:52:41 +0000 (16:52 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Copy dba_*() keys before converting to string.

11 years agoCopy dba_*() keys before converting to string.
Adam Harvey [Sun, 22 Sep 2013 23:46:17 +0000 (16:46 -0700)]
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).

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Sat, 21 Sep 2013 00:10:16 +0000 (17:10 -0700)]
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

11 years agoMerge branch 'PHP-5.5'
Adam Harvey [Fri, 20 Sep 2013 21:21:28 +0000 (14:21 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix the broken sh syntax in ext/imap/config.m4.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Fri, 20 Sep 2013 21:19:01 +0000 (14:19 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix the broken sh syntax in ext/imap/config.m4.

11 years agoFix the broken sh syntax in ext/imap/config.m4.
Adam Harvey [Fri, 20 Sep 2013 21:15:19 +0000 (14:15 -0700)]
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).

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Fri, 20 Sep 2013 14:01:11 +0000 (16:01 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement

11 years agoFixed bug #65678 the test cli_process_title_windows will fails on particular environn...
Anatol Belski [Fri, 20 Sep 2013 13:59:33 +0000 (15:59 +0200)]
Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement

Patch by Pierre Renaudet

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 20 Sep 2013 03:38:53 +0000 (20:38 -0700)]
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.

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 20 Sep 2013 03:27:28 +0000 (20:27 -0700)]
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

11 years agoMerge branch 'PHP-5.5'
Christopher Jones [Fri, 20 Sep 2013 03:23:18 +0000 (20:23 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added application/pdf to PHP CLI Web Server mime types.

11 years agoAdded application/pdf to PHP CLI Web Server mime types.
Christopher Jones [Fri, 20 Sep 2013 03:22:50 +0000 (20:22 -0700)]
Added application/pdf to PHP CLI Web Server mime types.

11 years agoMerge branch 'PHP-5.5'
Christopher Jones [Fri, 20 Sep 2013 03:22:12 +0000 (20:22 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Thu, 19 Sep 2013 17:53:22 +0000 (10:53 -0700)]
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

11 years agoadd note about request_body and php://input
Michael Wallner [Thu, 19 Sep 2013 13:40:10 +0000 (15:40 +0200)]
add note about request_body and php://input

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Thu, 19 Sep 2013 12:40:24 +0000 (05:40 -0700)]
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

11 years agoBuild OCI8 2.0 on Windows with Oracle Database 12c libraries only
Christopher Jones [Thu, 19 Sep 2013 02:50:32 +0000 (19:50 -0700)]
Build OCI8 2.0 on Windows with Oracle Database 12c libraries only

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Thu, 19 Sep 2013 02:49:40 +0000 (19:49 -0700)]
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
  ...

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 19 Sep 2013 02:49:36 +0000 (19:49 -0700)]
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

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 19 Sep 2013 02:49:30 +0000 (19:49 -0700)]
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

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Wed, 18 Sep 2013 15:16:09 +0000 (08:16 -0700)]
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"

11 years agobetter way to fix PRIu64 availability on windows
Anatol Belski [Wed, 18 Sep 2013 13:14:36 +0000 (15:14 +0200)]
better way to fix PRIu64 availability on windows

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Wed, 18 Sep 2013 13:06:58 +0000 (15:06 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
David Soria Parra [Wed, 18 Sep 2013 13:06:51 +0000 (15:06 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"

11 years agoRevert "EmptyIterator now implements Countable; fixes bug 60577"
David Soria Parra [Wed, 18 Sep 2013 13:06:19 +0000 (15:06 +0200)]
Revert "EmptyIterator now implements Countable; fixes bug 60577"

This reverts commit 8a936e8eb938965b0daaf076c109ec60141e57a7.

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Wed, 18 Sep 2013 12:41:20 +0000 (05:41 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  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

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Wed, 18 Sep 2013 12:29:02 +0000 (14:29 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  RFC 6598 reserved ip range starts at 100.64.0.0

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
David Soria Parra [Wed, 18 Sep 2013 12:28:57 +0000 (14:28 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  RFC 6598 reserved ip range starts at 100.64.0.0

11 years agoRFC 6598 reserved ip range starts at 100.64.0.0
David Soria Parra [Wed, 18 Sep 2013 12:26:10 +0000 (14:26 +0200)]
RFC 6598 reserved ip range starts at 100.64.0.0

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Wed, 18 Sep 2013 09:12:44 +0000 (11:12 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix a very rare case of use of uninitialized value combined with a memleak

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Wed, 18 Sep 2013 09:12:11 +0000 (11:12 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix a very rare case of use of uninitialized value combined with a memleak

11 years agofix a very rare case of use of uninitialized value combined with a
Michael Wallner [Wed, 18 Sep 2013 09:10:55 +0000 (11:10 +0200)]
fix a very rare case of use of uninitialized value combined with a
memleak

11 years agofix test concurrency
Michael Wallner [Wed, 18 Sep 2013 09:02:45 +0000 (11:02 +0200)]
fix test concurrency

11 years agofix test concurrency
Michael Wallner [Wed, 18 Sep 2013 08:53:11 +0000 (10:53 +0200)]
fix test concurrency

11 years agofix test concurrency
Michael Wallner [Wed, 18 Sep 2013 08:52:51 +0000 (10:52 +0200)]
fix test concurrency

11 years agofix test concurrency
Michael Wallner [Wed, 18 Sep 2013 08:52:35 +0000 (10:52 +0200)]
fix test concurrency

11 years agofix test concurrency
Michael Wallner [Wed, 18 Sep 2013 08:52:18 +0000 (10:52 +0200)]
fix test concurrency

11 years agofix build - PRIu64 vs %I64u
Anatol Belski [Tue, 17 Sep 2013 14:02:08 +0000 (16:02 +0200)]
fix build - PRIu64 vs %I64u

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Tue, 17 Sep 2013 12:40:50 +0000 (05:40 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src: (27 commits)
  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
  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
  remove unused code
  tests
  make reading php://input JIT if enable_post_data_reading=0
  revert stream cast
  fix ZTS build
  slim post data
  ...

11 years agofinal bits
Michael Wallner [Tue, 17 Sep 2013 11:59:49 +0000 (13:59 +0200)]
final bits

11 years agoMerge branch 'slim-postdata-merge'
Michael Wallner [Tue, 17 Sep 2013 11:52:25 +0000 (13:52 +0200)]
Merge branch 'slim-postdata-merge'

* slim-postdata-merge:
  remove unused code
  tests
  make reading php://input JIT if enable_post_data_reading=0
  revert stream cast
  fix ZTS build
  slim post data

Conflicts:
ext/soap/soap.c
ext/standard/php_fopen_wrapper.c
main/SAPI.c

11 years agowe need to use the full stream wrapper for filters
Michael Wallner [Tue, 17 Sep 2013 11:44:02 +0000 (13:44 +0200)]
we need to use the full stream wrapper for filters

11 years agolet the libsqlite3 symbols be exported in dll
Anatol Belski [Tue, 17 Sep 2013 11:05:44 +0000 (13:05 +0200)]
let the libsqlite3 symbols be exported in dll

11 years agoMerge remote-tracking branch 'refs/remotes/origin/master'
Michael Wallner [Tue, 17 Sep 2013 09:10:38 +0000 (11:10 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/master'

* refs/remotes/origin/master:
  Exclude bison 3.0 by Mike

11 years agoNEWS/UPGRADING{,.INTERNALS} notes about temp POST stream
Michael Wallner [Tue, 17 Sep 2013 09:08:23 +0000 (11:08 +0200)]
NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream

11 years agoExclude bison 3.0 by Mike
Xinchen Hui [Tue, 17 Sep 2013 08:54:27 +0000 (16:54 +0800)]
Exclude bison 3.0 by Mike

11 years agoMerge branch 'slim-postdata'
Michael Wallner [Tue, 17 Sep 2013 08:50:49 +0000 (10:50 +0200)]
Merge branch 'slim-postdata'

* slim-postdata:
  slim post data
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Tue, 17 Sep 2013 07:55:59 +0000 (09:55 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
David Soria Parra [Tue, 17 Sep 2013 07:55:03 +0000 (09:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses

11 years agoNEWS for added reserved ip addresses according to RFC 6598
David Soria Parra [Tue, 17 Sep 2013 07:54:58 +0000 (09:54 +0200)]
NEWS for added reserved ip addresses according to RFC 6598

11 years agoAdd RFC 6598 IPs to reserved addresses
Sebastian Nohn [Sun, 15 Sep 2013 17:18:20 +0000 (19:18 +0200)]
Add RFC 6598 IPs to reserved addresses

(cherry picked from commit b3f5b822e9f83d99d7cb5eed36ba8d307d1408ee)

11 years agoupload2G note
Michael Wallner [Tue, 17 Sep 2013 06:04:07 +0000 (08:04 +0200)]
upload2G note

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Mon, 16 Sep 2013 21:36:48 +0000 (23:36 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
David Soria Parra [Mon, 16 Sep 2013 21:36:37 +0000 (23:36 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Mon, 16 Sep 2013 17:21:31 +0000 (10:21 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

# By Michael Wallner (3) and others
# Via Michael Wallner (2) and Xinchen Hui (2)
* 'master' of https://git.php.net/repository/php-src:
  use 65k of data to get a more explicit result
  double test timeout for travis
  this test is fragile on travis, let's see why
  Add test for ISSUE #128
  Fixed bug #65665 (Exception not properly caught when opcache enabled)
  Save a TSRMLS_FETCH() for zval_ptr_dtor in executor

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Mon, 16 Sep 2013 17:21:22 +0000 (10:21 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Xinchen Hui (2) and Michael Wallner (1)
# Via Michael Wallner
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  double test timeout for travis
  Add test for ISSUE #128
  Fixed bug #65665 (Exception not properly caught when opcache enabled)

11 years agoNEWS for #60577
David Soria Parra [Mon, 16 Sep 2013 14:23:29 +0000 (16:23 +0200)]
NEWS for #60577

11 years agoNEWS for bug #64441
David Soria Parra [Mon, 16 Sep 2013 03:21:42 +0000 (05:21 +0200)]
NEWS for bug #64441

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Mon, 16 Sep 2013 12:40:44 +0000 (05:40 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  use 65k of data to get a more explicit result
  double test timeout for travis
  this test is fragile on travis, let's see why
  Add test for ISSUE #128
  Fixed bug #65665 (Exception not properly caught when opcache enabled)
  Save a TSRMLS_FETCH() for zval_ptr_dtor in executor

11 years agouse 65k of data to get a more explicit result
Michael Wallner [Mon, 16 Sep 2013 08:50:02 +0000 (10:50 +0200)]
use 65k of data to get a more explicit result

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Mon, 16 Sep 2013 07:35:29 +0000 (09:35 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  double test timeout for travis

11 years agodouble test timeout for travis
Michael Wallner [Mon, 16 Sep 2013 07:35:08 +0000 (09:35 +0200)]
double test timeout for travis

11 years agothis test is fragile on travis, let's see why
Michael Wallner [Mon, 16 Sep 2013 07:29:42 +0000 (09:29 +0200)]
this test is fragile on travis, let's see why

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Mon, 16 Sep 2013 07:03:09 +0000 (15:03 +0800)]
Merge branch 'PHP-5.5'

11 years agoAdd test for ISSUE #128
Xinchen Hui [Mon, 16 Sep 2013 06:58:18 +0000 (14:58 +0800)]
Add test for ISSUE #128

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Mon, 16 Sep 2013 06:43:13 +0000 (14:43 +0800)]
Merge branch 'PHP-5.5'

11 years agoFixed bug #65665 (Exception not properly caught when opcache enabled)
Xinchen Hui [Mon, 16 Sep 2013 06:43:01 +0000 (14:43 +0800)]
Fixed bug #65665 (Exception not properly caught when opcache enabled)

11 years agoFix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
Alex Bobrov [Sun, 21 Apr 2013 07:32:02 +0000 (14:32 +0700)]
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)

(cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)

11 years agoEmptyIterator now implements Countable; fixes bug 60577
Levi Morrison [Thu, 12 Sep 2013 22:03:39 +0000 (16:03 -0600)]
EmptyIterator now implements Countable; fixes bug 60577

(cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)

11 years agoNews for bugfix #64157
David Soria Parra [Mon, 16 Sep 2013 01:48:34 +0000 (03:48 +0200)]
News for bugfix #64157

11 years agoBug 64157
Boro Sitnikovski [Fri, 13 Sep 2013 00:20:19 +0000 (02:20 +0200)]
Bug 64157
Changed error message to make sense

11 years agoSave a TSRMLS_FETCH() for zval_ptr_dtor in executor
Nikita Popov [Sat, 14 Sep 2013 12:40:48 +0000 (14:40 +0200)]
Save a TSRMLS_FETCH() for zval_ptr_dtor in executor

This gives me about 9% improvement on Zend/bench.php for a zts build.

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 13 Sep 2013 23:46:20 +0000 (16:46 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fix intl build

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 13 Sep 2013 23:44:10 +0000 (16:44 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src:
  Fix intl build

11 years agoFix intl build
Nikita Popov [Fri, 13 Sep 2013 23:37:09 +0000 (01:37 +0200)]
Fix intl build

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 13 Sep 2013 23:21:28 +0000 (16:21 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Remove some more unnecessary macros from phar
  Remove PHAR_(Z)STR* usages
  Remove version checks in phar

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 13 Sep 2013 21:10:58 +0000 (14:10 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

# By Nikita Popov (10) and others
# Via Nikita Popov (6) and others
* 'master' of https://git.php.net/repository/php-src: (26 commits)
  Remove some more unnecessary macros from phar
  Remove PHAR_(Z)STR* usages
  Remove version checks in phar
  Fix two warnings
  Provide more macros for handling of interned strings
  Make use of Z_*VAL and ZVAL_* in language scanner
  Make consistent use of Z_*VAL macros in compiler
  fix broken sha2 configure tests
  fix broken sha2 configure tests
  Small cleanup in class name resolution of compiler
  Fixed minor bug in test.
  Move NEWS entries to correct version
  Fix bug #64782: SplFileObject constructor make $context optional
  Prepare pdo_firebird for a pecl release also
  Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime
  Fix bug #65548: Comparison for DateTimeImmutable doesn't work
  Sort the NEWS file alphabetically.
  Request non-keep-alive connections by default in HTTP 1.1 requests.
  Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
  Tinker with the wording of the short_open_tag description.
  ...

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Fri, 13 Sep 2013 21:10:53 +0000 (14:10 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Adam Harvey (3) and others
# Via Adam Harvey (2) and Michael Wallner (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  fix broken sha2 configure tests
  Fixed minor bug in test.
  Move NEWS entries to correct version
  Fix bug #64782: SplFileObject constructor make $context optional
  Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime
  Fix bug #65548: Comparison for DateTimeImmutable doesn't work
  Tinker with the wording of the short_open_tag description.
  Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
  Handle CLI server request headers case insensitively.
  ensure that the defined interpolation method is used by the generic scaling functions
  Fixed issue #128 (opcache_invalidate segmentation fault)
  5.4.21 now

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Fri, 13 Sep 2013 21:10:50 +0000 (14:10 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Adam Harvey
# Via Adam Harvey
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Tinker with the wording of the short_open_tag description.
  Handle CLI server request headers case insensitively.

11 years agoRemove some more unnecessary macros from phar
Nikita Popov [Fri, 13 Sep 2013 19:40:32 +0000 (21:40 +0200)]
Remove some more unnecessary macros from phar

11 years agoRemove PHAR_(Z)STR* usages
Nikita Popov [Fri, 13 Sep 2013 19:21:23 +0000 (21:21 +0200)]
Remove PHAR_(Z)STR* usages

11 years agoRemove version checks in phar
Nikita Popov [Fri, 13 Sep 2013 18:49:09 +0000 (20:49 +0200)]
Remove version checks in phar

No need to keep around compatability code for PHP 5.0 and PHP 6.