Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merged pull request #36

  • Loading branch information...
commit f0180b531102333dea9b37fe7cc3a9b81cb78da9 2 parents 1806446 + aaffd6f
@derickr authored
Showing with 34 additions and 0 deletions.
  1. +34 −0 xdebug.ini
View
34 xdebug.ini
@@ -17,7 +17,13 @@
; -----------------------------------------------------------------------------
; xdebug.cli_color
;
+<<<<<<< HEAD
; Type: boolean, Default value: 0
+=======
+; Only in Xdebug versions > 2.2
+;
+; Type: integer, Default value: 0
+>>>>>>> 6444e03... Update the changed xdebug.ini.
;
; If this setting is 1, Xdebug will color var_dumps and stack traces output when
; in CLI mode.
@@ -28,6 +34,8 @@
; -----------------------------------------------------------------------------
; xdebug.collect_assignments
;
+; Only in Xdebug versions > 2.1
+;
; Type: boolean, Default value: 0
;
; This setting, defaulting to 0, controls whether Xdebug should add variable
@@ -121,6 +129,8 @@
; -----------------------------------------------------------------------------
; xdebug.coverage_enable
;
+; Only in Xdebug versions > 2.2
+;
; Type: boolean, Default value: 1
;
; If this setting is set to 0, then Xdebug will not set-up internal structures
@@ -211,6 +221,8 @@
; -----------------------------------------------------------------------------
; xdebug.file_link_format
;
+; Only in Xdebug versions > 2.1
+;
; Type: string, Default value:
;
; This setting determines the format of the links that are made in the display
@@ -280,6 +292,8 @@
; -----------------------------------------------------------------------------
; xdebug.manual_url
;
+; Only in Xdebug versions < 2.2.1
+;
; Type: string, Default value: http://www.php.net
;
; This is the base url for the links from the function traces and error message
@@ -304,6 +318,8 @@
; -----------------------------------------------------------------------------
; xdebug.overload_var_dump
;
+; Only in Xdebug versions > 2.1
+;
; Type: boolean, Default value: 1
;
; By default Xdebug overloads var_dump() with its own improved version for
@@ -398,6 +414,8 @@
; -----------------------------------------------------------------------------
; xdebug.remote_connect_back
;
+; Only in Xdebug versions > 2.1
+;
; Type: boolean, Default value: 0
;
; If enabled, the xdebug.remote_host setting is ignored and Xdebug will try to
@@ -413,6 +431,8 @@
; -----------------------------------------------------------------------------
; xdebug.remote_cookie_expire_time
;
+; Only in Xdebug versions > 2.1
+;
; Type: integer, Default value: 3600
;
; This setting can be used to increase (or decrease) the time that the remote
@@ -517,6 +537,8 @@
; -----------------------------------------------------------------------------
; xdebug.scream
;
+; Only in Xdebug versions > 2.1
+;
; Type: boolean, Default value: 0
;
; If this setting is 1, then Xdebug will disable the @ (shut-up) operator so
@@ -565,6 +587,8 @@
; -----------------------------------------------------------------------------
; xdebug.trace_enable_trigger
;
+; Only in Xdebug versions > 2.2
+;
; Type: boolean, Default value: 0
;
; When this setting is set to 1, you can trigger the generation of trace files
@@ -600,6 +624,7 @@
;
; Fields for the computerized format:
;
+<<<<<<< HEAD
; =========== ===== ========== ========== ========== ============ ============= ========================================= ================================ ======== ===========
; Record type 1 2 3 4 5 6 7 8 9 10
; =========== ===== ========== ========== ========== ============ ============= ========================================= ================================ ======== ===========
@@ -608,6 +633,15 @@
; ----------- ----- ---------- ---------- ---------- ------------ ------------- ----------------------------------------- -------------------------------- -------- -----------
; Exit level function # always '1' time index memory usage empty
; =========== ===== ========== ========== ========== ============ ============= ========================================= ================================ ======== ===========
+=======
+; =========== ===== =========== =========== ========== ============ ============= =========================================== ================================ ======== ===========
+; Record type 1 2 3 4 5 6 7 8 9 10
+; =========== ===== =========== =========== ========== ============ ============= =========================================== ================================ ======== ===========
+; Entry level function # always '0' time index memory usage function name user-defined (1) or internal function (0) name of the include/require file filename line number
+; ----------- ----- ----------- ----------- ---------- ------------ ------------- ------------------------------------------- -------------------------------- -------- -----------
+; Exit level function # always '1' time index memory usage empty
+; =========== ===== =========== =========== ========== ============ ============= =========================================== ================================ ======== ===========
+>>>>>>> 6444e03... Update the changed xdebug.ini.
;
; See the introduction of Function Traces for a few examples.
;
Please sign in to comment.
Something went wrong with that request. Please try again.