[xdebug-dev] [xdebug/xdebug] 9c90d2: Merge branch 'xdebug_2_3'

From: Derick Rethans <github[@]derickrethans.nl>
Date: Mon, 15 Jun 2015 13:18:21 -0700

  Branch: refs/heads/master
  Home: https://github.com/xdebug/xdebug
  Commit: 9c90d26d3c02018d1ed0afd21fe1ee8e3e530d59
      https://github.com/xdebug/xdebug/commit/9c90d26d3c02018d1ed0afd21fe1ee8e3e530d59
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-02-22 (Sun, 22 Feb 2015)

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 6cafb33a05d9c57174612baf3a8c2256d19a8fe6
      https://github.com/xdebug/xdebug/commit/6cafb33a05d9c57174612baf3a8c2256d19a8fe6
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M php_xdebug.h
    M template.rc

  Log Message:
  -----------
  Back to -dev for the 3.0 branch

  Commit: 9b15fe07b3badc334a99de06d1194d057e017183
      https://github.com/xdebug/xdebug/commit/9b15fe07b3badc334a99de06d1194d057e017183
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M tests/bug00355.phpt
    M tests/bug00360.phpt
    M tests/bug00631.phpt
    M tests/bug00639.phpt
    M tests/bug00643.phpt
    M tests/bug00714.phpt
    M tests/bug00785-1.phpt
    M tests/bug00785-2.phpt
    M tests/bug00843.phpt
    M tests/test18a.phpt
    M tests/trace1.phpt

  Log Message:
  -----------
  Update tests for new major version number (3)

  Commit: 91439e21efe5adeeaa4e8a1650a1dec805503a47
      https://github.com/xdebug/xdebug/commit/91439e21efe5adeeaa4e8a1650a1dec805503a47
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M package.xml

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 425afad85758a8122b19640f5237736be696e06e
      https://github.com/xdebug/xdebug/commit/425afad85758a8122b19640f5237736be696e06e
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M php_xdebug.h
    A tests/bug01112.phpt
    M xdebug_tracing.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: b1830ef8310a9f45fa1b46b0902bdc504656373d
      https://github.com/xdebug/xdebug/commit/b1830ef8310a9f45fa1b46b0902bdc504656373d
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M xdebug.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 8079a4db3fcbc48ec748deeb8469a979f582df7a
      https://github.com/xdebug/xdebug/commit/8079a4db3fcbc48ec748deeb8469a979f582df7a
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M tests/bug00811.phpt
    M tests/bug01111-001.phpt
    M tests/bug01111-002.phpt

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 176dc6bde14bbcc70f01bc8ba899b5955eb56e9a
      https://github.com/xdebug/xdebug/commit/176dc6bde14bbcc70f01bc8ba899b5955eb56e9a
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-02-24 (Tue, 24 Feb 2015)

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 543ea17be0f3cdb77ba9c3ff31036150631e6710
      https://github.com/xdebug/xdebug/commit/543ea17be0f3cdb77ba9c3ff31036150631e6710
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-02-28 (Sat, 28 Feb 2015)

  Changed paths:
    M xdebug_branch_info.c
    M xdebug_code_coverage.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 16f1c8160bc4338526a24c4e467941b7998e2aa5
      https://github.com/xdebug/xdebug/commit/16f1c8160bc4338526a24c4e467941b7998e2aa5
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-03-21 (Sat, 21 Mar 2015)

  Changed paths:
    M xdebug_branch_info.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 605e6c6f7cec9f70af0ab30407bd7210c9e85884
      https://github.com/xdebug/xdebug/commit/605e6c6f7cec9f70af0ab30407bd7210c9e85884
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-03-21 (Sat, 21 Mar 2015)

  Changed paths:
    M xdebug_branch_info.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: b6024b3a4d72f31c365c6b120d891f7513c19db6
      https://github.com/xdebug/xdebug/commit/b6024b3a4d72f31c365c6b120d891f7513c19db6
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-03-22 (Sun, 22 Mar 2015)

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: bfe69665c5ef14ea96f59297301a7ad76a31c544
      https://github.com/xdebug/xdebug/commit/bfe69665c5ef14ea96f59297301a7ad76a31c544
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    A tests/bug01133.phpt
    M xdebug.c
    M xdebug_handler_dbgp.c
    M xdebug_handler_dbgp.h
    M xdebug_handlers.h
    M xdebug_stack.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: d799785c95c5b740392b667f4524a832cff52363
      https://github.com/xdebug/xdebug/commit/d799785c95c5b740392b667f4524a832cff52363
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    A tests/bug00996-001.phpt
    A tests/bug00996-002.phpt
    A tests/bug00996.inc
    M xdebug_var.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: fcbefa6ca55757d1aaec72511b71bbfc113e33dc
      https://github.com/xdebug/xdebug/commit/fcbefa6ca55757d1aaec72511b71bbfc113e33dc
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-04-19 (Sun, 19 Apr 2015)

  Changed paths:
    A tests/bug00843-001.phpt
    A tests/bug00843-002.phpt
    R tests/bug00843.phpt
    M usefulstuff.c
    M xdebug_stack.c
    M xdebug_str.c
    M xdebug_trace_computerized.c
    M xdebug_trace_html.c
    M xdebug_trace_textual.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: b262096dbad9bea9f5ac491d6a6580c15ab9f7b7
      https://github.com/xdebug/xdebug/commit/b262096dbad9bea9f5ac491d6a6580c15ab9f7b7
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-10 (Sun, 10 May 2015)

  Changed paths:
    M xdebug.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: fd4d59bc09f3eb66dd792e86789af9d5ea726e14
      https://github.com/xdebug/xdebug/commit/fd4d59bc09f3eb66dd792e86789af9d5ea726e14
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-13 (Wed, 13 May 2015)

  Changed paths:
    A tests/bug01148.phpt
    M xdebug.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 5136c82e65dae520becd035bac621470338de072
      https://github.com/xdebug/xdebug/commit/5136c82e65dae520becd035bac621470338de072
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    A CONTRIBUTING.rst

  Log Message:
  -----------
  Added contributing file

  Commit: 84254ecd4935d2592aa0dc5641d1d1ebf950405d
      https://github.com/xdebug/xdebug/commit/84254ecd4935d2592aa0dc5641d1d1ebf950405d
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Fixed formatting

  Commit: 397774a4e13258b720b7c8157c4b9a6d786b40db
      https://github.com/xdebug/xdebug/commit/397774a4e13258b720b7c8157c4b9a6d786b40db
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    R README
    A README.rst

  Log Message:
  -----------
  reStructuredTextify the README.

  Commit: bbd2b9b121d9a513445e4eb04dfe519a96e74f1e
      https://github.com/xdebug/xdebug/commit/bbd2b9b121d9a513445e4eb04dfe519a96e74f1e
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Tidy up some language.

  Commit: ba4aff04c43d21b5f77caaa7725bfa5b15c91ad4
      https://github.com/xdebug/xdebug/commit/ba4aff04c43d21b5f77caaa7725bfa5b15c91ad4
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Added link to support.php for ... support.

  Commit: 55762dd655533de990bc6b4f2fb2cd224172dede
      https://github.com/xdebug/xdebug/commit/55762dd655533de990bc6b4f2fb2cd224172dede
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M php_xdebug.h
    A tests/monitor-functions-001.phpt
    A tests/monitor-functions-002.phpt
    A tests/monitor-functions-003.phpt
    M xdebug.c
    M xdebug_stack.c

  Log Message:
  -----------
  Implemented #1153: Basic function monitoring

  Commit: 495b95b5bba1a1a13d97d4317b99db3fef741830
      https://github.com/xdebug/xdebug/commit/495b95b5bba1a1a13d97d4317b99db3fef741830
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    A tests/monitor-functions-004.phpt

  Log Message:
  -----------
  Added test case for static and dynamic method names

  Commit: e061472116cc6fdf24488b32af9f6d0ea3408f12
      https://github.com/xdebug/xdebug/commit/e061472116cc6fdf24488b32af9f6d0ea3408f12
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M config.m4
    M config.w32
    M package.xml
    M xdebug.c
    A xdebug_monitor.c
    A xdebug_monitor.h
    M xdebug_stack.c

  Log Message:
  -----------
  Separate monitoring into its own files

  Commit: 3db0de7f95397a0d9ec29e3e4bc4435150cb541e
      https://github.com/xdebug/xdebug/commit/3db0de7f95397a0d9ec29e3e4bc4435150cb541e
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M tests/monitor-functions-003.phpt
    M tests/monitor-functions-004.phpt
    M xdebug_monitor.c

  Log Message:
  -----------
  Instead of just showing the function name, we're also adding file/line combination

  Commit: 6aa856fcaea797e17ff2511cbbb4c4a87b9381ec
      https://github.com/xdebug/xdebug/commit/6aa856fcaea797e17ff2511cbbb4c4a87b9381ec
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M xdebug_monitor.c
    M xdebug_monitor.h
    M xdebug_stack.c

  Log Message:
  -----------
  Fixed ZTS issues

  Commit: 8a9c82b9186ef4fbcd8caacd95af8f66c38e3e3a
      https://github.com/xdebug/xdebug/commit/8a9c82b9186ef4fbcd8caacd95af8f66c38e3e3a
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M tests/monitor-functions-003.phpt
    M tests/monitor-functions-004.phpt

  Log Message:
  -----------
  Fixed test cases

  Commit: b556dde5a97317b22e226c1829252d00354acfc9
      https://github.com/xdebug/xdebug/commit/b556dde5a97317b22e226c1829252d00354acfc9
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M tests/monitor-functions-003.phpt
    M tests/monitor-functions-004.phpt

  Log Message:
  -----------
  Fixed test cases - now for real

  Commit: 9f6c946c4841d07fbebe1075a86bd91cb77b52ce
      https://github.com/xdebug/xdebug/commit/9f6c946c4841d07fbebe1075a86bd91cb77b52ce
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M config.m4
    M config.w32
    M package.xml
    M php_xdebug.h
    A tests/monitor-functions-001.phpt
    A tests/monitor-functions-002.phpt
    A tests/monitor-functions-003.phpt
    A tests/monitor-functions-004.phpt
    M xdebug.c
    A xdebug_monitor.c
    A xdebug_monitor.h
    M xdebug_stack.c

  Log Message:
  -----------
  Merged pull request #175

  Commit: e3b3c5362993794e571dbe1a614eca706c83bfe1
      https://github.com/xdebug/xdebug/commit/e3b3c5362993794e571dbe1a614eca706c83bfe1
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M usefulstuff.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 1eb61105f811d09bc90109c611083ac0fad62dc4
      https://github.com/xdebug/xdebug/commit/1eb61105f811d09bc90109c611083ac0fad62dc4
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-27 (Wed, 27 May 2015)

  Changed paths:
    M xdebug_stack.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: d5594f3db979b5c943bf2d6796aedb6487da48d7
      https://github.com/xdebug/xdebug/commit/d5594f3db979b5c943bf2d6796aedb6487da48d7
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M xdebug_stack.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: c5d3cb9ce9284e20f5e16efd7c8bf14b96df2822
      https://github.com/xdebug/xdebug/commit/c5d3cb9ce9284e20f5e16efd7c8bf14b96df2822
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M xdebug.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 2c6604131346a12185e28cdae354a8a329c4cd52
      https://github.com/xdebug/xdebug/commit/2c6604131346a12185e28cdae354a8a329c4cd52
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-06-06 (Sat, 06 Jun 2015)

  Changed paths:
    M php_xdebug.h
    M tests/remote_log2.phpt
    M tests/remote_log3.phpt
    A tests/remote_log4.phpt
    M xdebug.c
    M xdebug_stack.c

  Log Message:
  -----------
  Implement issue #1129: Allow for user configured header to obtain address for connect back

  Commit: 2962049bbc9e5756acd5409b1b16a179e89f71e8
      https://github.com/xdebug/xdebug/commit/2962049bbc9e5756acd5409b1b16a179e89f71e8
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-06-06 (Sat, 06 Jun 2015)

  Changed paths:
    M php_xdebug.h
    M tests/remote_log2.phpt
    M tests/remote_log3.phpt
    A tests/remote_log4.phpt
    M xdebug.c
    M xdebug_stack.c

  Log Message:
  -----------
  Merged pull request #181

  Commit: 884fe055baaa49387de43ecade50f02028eaa561
      https://github.com/xdebug/xdebug/commit/884fe055baaa49387de43ecade50f02028eaa561
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    A tests/bug01130.phpt
    M xdebug_stack.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

  Commit: 6acaefc5b4659f3733c877668af1d174c6664211
      https://github.com/xdebug/xdebug/commit/6acaefc5b4659f3733c877668af1d174c6664211
  Author: Derick Rethans <github[@]derickrethans.nl>
  Date: 2015-06-14 (Sun, 14 Jun 2015)

  Changed paths:
    A tests/bug00686.inc
    A tests/bug00686.phpt
    M xdebug_var.c

  Log Message:
  -----------
  Merge branch 'xdebug_2_3'

Compare: https://github.com/xdebug/xdebug/compare/8e87621d6dfa...6acaefc5b465
Received on Mon Jun 15 2015 - 21:18:23 BST

This archive was generated by hypermail 2.2.0 : Sun Jun 24 2018 - 04:00:03 BST