Commit Graph

99431 Commits

Author SHA1 Message Date
Stanislav Malyshev
b9837dc183 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Use correct string release function
2017-01-02 22:08:42 -08:00
Stanislav Malyshev
68ac602b28 Use correct string release function 2017-01-02 22:08:25 -08:00
Stanislav Malyshev
0f0406a1c9 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix error reporting
2017-01-02 21:59:59 -08:00
Stanislav Malyshev
ea6e54aff3 Fix error reporting 2017-01-02 21:59:44 -08:00
Stanislav Malyshev
ca72faa2c5 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix #73832 - leave the table in a safe state if the size is too big.
  Fix bug #73831 - NULL Pointer Dereference while unserialize php object
2017-01-02 21:37:06 -08:00
Stanislav Malyshev
a6cdefe043 Merge branch 'PHP-7.0.15' into PHP-7.0
* PHP-7.0.15:
  Fix #73832 - leave the table in a safe state if the size is too big.
  Fix bug #73831 - NULL Pointer Dereference while unserialize php object
2017-01-02 21:35:42 -08:00
Stanislav Malyshev
2075fb2b73 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix bug #73737 FPE when parsing a tag format
  Fix bug #73773 - Seg fault when loading hostile phar
  Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
  Fix bug #73768 - Memory corruption when loading hostile phar
  Fix int overflows in phar (bug #73764)
2017-01-02 21:07:01 -08:00
Stanislav Malyshev
7f0de1a138 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix bug #73737 FPE when parsing a tag format
  Fix bug #73773 - Seg fault when loading hostile phar
  Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
  Fix bug #73768 - Memory corruption when loading hostile phar
  Fix int overflows in phar (bug #73764)
2017-01-02 21:01:35 -08:00
Stanislav Malyshev
fa2125df67 Merge branch 'PHP-5.6.30' into PHP-5.6
* PHP-5.6.30:
  Fix bug #73737 FPE when parsing a tag format
  Fix bug #73773 - Seg fault when loading hostile phar
  Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
  Fix bug #73768 - Memory corruption when loading hostile phar
  Fix int overflows in phar (bug #73764)
2017-01-02 20:56:32 -08:00
Stanislav Malyshev
4cc0286f2f Fix #73832 - leave the table in a safe state if the size is too big. 2017-01-02 20:14:05 -08:00
Anatol Belski
ed8fdad72b Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1 2017-01-03 02:24:23 +01:00
Nikita Popov
2a4d0a7a0f Fix test after mail.log change 2017-01-03 02:18:00 +01:00
Anatol Belski
f44ef0ba3f Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  set exclude AppVeyor branches and ignore builds on NEWS updates
2017-01-03 02:17:44 +01:00
Anatol Belski
d2298c3cec set exclude AppVeyor branches and ignore builds on NEWS updates 2017-01-03 02:15:20 +01:00
Nikita Popov
a08747bb4c Merge branch 'PHP-7.0' into PHP-7.1 2017-01-03 02:13:04 +01:00
Nikita Popov
e1e5caf9d4 Fix early free 2017-01-03 02:12:28 +01:00
Anatol Belski
26c944a855 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Disable pdb generation for AppVeyor
2017-01-03 01:11:41 +01:00
Anatol Belski
f12f0b2bc2 Disable pdb generation for AppVeyor
It is not needed for the test runs and would speedup the compilation
phase.
2017-01-03 01:07:55 +01:00
Nikita Popov
43ed89ea31 Fix data_size decrement
We don't want to decrement the pointer...
2017-01-02 23:47:30 +01:00
Nikita Popov
737eb060db Merge branch 'PHP-7.0' into PHP-7.1 2017-01-02 23:39:35 +01:00
Nikita Popov
20c172d459 Add NEWS entries 2017-01-02 23:35:27 +01:00
Nikita Popov
593b6cd0a8 Optimize get_browser() using prefix and contains checks
Avoid expensive regex compilations by checking for prefix
and contained segments beforehand.
2017-01-02 23:31:27 +01:00
Nikita Popov
b06fb88cf9 Optimize browscap loading and representation
Avoid many string duplications, use interning (browscap-local, of
course), reduce pattern size, use more compact key-value
representation, build result array only on demand.
2017-01-02 23:30:56 +01:00
Nikita Popov
76a1d3f153 Add get_browser() test against larger corpus
Testing corpus provided by Anatol against current browscap.ini lite.

About 30% of all agents are not recognized by this browscap.ini,
but this should give us decent coverage.
2017-01-02 23:30:27 +01:00
Mitch Hagstrand
0acaa97a16
Fix for nowait.phpt failing intermittently
The parent process was releasing the child semaphore
after the child process continued execution. Now
the child semaphore is released before the child
process continues execution.
2017-01-02 16:45:52 +00:00
Mitch Hagstrand
c019d33267
Fix for nowait.phpt failing intermittently
The parent process was releasing the child semaphore
after the child process continued execution. Now
the child semaphore is released before the child
process continues execution.
2017-01-02 16:44:43 +00:00
vanviegen
abba56f605
Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE
Fixes bug #73800

news entry for PR #2249
2017-01-02 14:56:41 +00:00
vanviegen
732f67ee6f
Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE
Fixes bug #73800

news entry for PR #2250
2017-01-02 14:54:45 +00:00
Joe Watkins
156781baf5
news entry for PR #2267 2017-01-02 11:58:57 +00:00
Joe Watkins
243dff2057
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  news entry for PR #2267
  Fixed #67474 (getElementsByTagNameNS and default namespace)
  Add (failing) testcase for bug #67474
2017-01-02 11:58:14 +00:00
Joe Watkins
9f4d05acec
news entry for PR #2267 2017-01-02 11:57:45 +00:00
Arnout Boks
a8955926c2
Fixed #67474 (getElementsByTagNameNS and default namespace)
This bug was caused by the fact that dom_get_elements_by_tag_name_ns_raw
uses an empty string to filter on the default namespace (as NULL means
'no filter'), whereas in the node itself the default namespace is
signalled by nodep->ns being null.
2017-01-02 11:56:37 +00:00
Arnout Boks
19c4a2ef19
Add (failing) testcase for bug #67474 2017-01-02 11:56:33 +00:00
Joe Watkins
3e798c4a5f
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src: (146 commits)
  Flush stderr on win32 in cli_log_message
  Fixed bug #73154
  FIx bug #70213
  Fix dom class can't be inherited by the internal class
  Another try at making concat_003 more reliable
  Fix flaky openssl_pkey_new test
  Make Opcache tests using the cli server more reliable
  Revert "Fix #73530: Unsetting result set may reset other result set"
  define php_ap_map_http_request_error function for older httpd only
  add old versions of httpd support
  Disable AppVeyor fast_finish
  Makes the sapi web server and curl tests more reliable
  Fixes the curl tests to be more reliable in Travis CI
  Interpretation of curl_setopt values for boolean parameters
  Fixes #65689. PDO_Firebrid / exec() does not free allocated statement.
  Fix alpn_ctx leaking in openssl
  Fixed bug #73373 (deflate_add does not verify that output was not truncated)
  Fix IS_UNDEF comparisons in opcache
  Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)
  Increase timing quota for small string concat test
  ...
2017-01-02 09:44:02 +00:00
Mitch Hagstrand
e077735b03
Fix nowait.phpt to no longer depend on sleeping
In Travis CI the nowait.phpt test sometimes fails because of
the usleep() not being long enough ensure proper
execution order. Instead of depending on sleeping the
test now uses two semaphores to guarantee execution order.
2017-01-02 09:43:47 +00:00
Joe Watkins
532486569a
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
  Flush stderr on win32 in cli_log_message
  Fixed bug #73154
2017-01-02 09:41:44 +00:00
Mitch Hagstrand
b4459af025
Fix nowait.phpt to no longer depend on sleeping
In Travis CI the nowait.phpt test sometimes fails because of
the usleep() not being long enough ensure proper
execution order. Instead of depending on sleeping the
test now uses two semaphores to guarantee execution order.
2017-01-02 09:40:46 +00:00
Nikita Popov
a5027d43dd Merge branch 'PHP-7.0' into PHP-7.1 2017-01-01 21:09:27 +01:00
Nikita Popov
935b5cb11e Flush stderr on win32 in cli_log_message
This allows us to unfork a bunch of tests for Windows.
2017-01-01 21:09:02 +01:00
Nikita Popov
70ca40d30f Merge branch 'PHP-7.0' into PHP-7.1 2017-01-01 19:26:36 +01:00
Nikita Popov
4877641962 Fixed bug #73154
The object that is being serialized may be destroyed during the
execution of __sleep(), so operate on a copy instead.
2017-01-01 19:24:41 +01:00
Joe Watkins
876b7b177f
news entry for PR #1414 2017-01-01 14:41:20 +00:00
Joe Watkins
e7d4a8ce8b
Merge branch 'pull-request/1414' into PHP-7.1
* Add subject to mail.log
2017-01-01 14:39:35 +00:00
Nikita Popov
878b8f0465 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-01 14:13:29 +01:00
Nikita Popov
9f560baef5 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-01 14:12:26 +01:00
Nikita Popov
a65ad951ad FIx bug #70213 2017-01-01 14:10:49 +01:00
Nikita Popov
2a34042323 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-01 12:20:46 +01:00
dreamszhu
3c977618e1 Fix dom class can't be inherited by the internal class 2017-01-01 12:20:04 +01:00
Nikita Popov
8467c5c9bf Fix year dependent test 2017-01-01 12:15:52 +01:00
Joe Watkins
e51f284c78
Revert "news entry for PR #2263"
This reverts commit 299e02c82a.
2017-01-01 06:52:59 +00:00