[PHP-CVS] com php-src: ...: web-bootstrap.php

[Bob Weinand]

Commit:25475ff95e1f1f30df22bc0d920692f92c199a2f
Author:krakjoe  Tue, 12 Nov 2013 07:01:28 
+
Parents:   4b2490426f46d360345d353b94c5b4a03c38a92a
Branches:  PHP-5.6

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=25475ff95e1f1f30df22bc0d920692f92c199a2f

Log:
...

Changed paths:
  M  web-bootstrap.php


Diff:
diff --git a/web-bootstrap.php b/web-bootstrap.php
index c5802c1..fdb40f9 100644
--- a/web-bootstrap.php
+++ b/web-bootstrap.php
@@ -1,8 +1,21 @@
  'localhost',


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: ...: web-bootstrap.php

[Bob Weinand]

Commit:6c5831aa09a85b069dfc0c9360547f960fb701e2
Author:krakjoe  Tue, 12 Nov 2013 07:08:00 
+
Parents:   25475ff95e1f1f30df22bc0d920692f92c199a2f
Branches:  PHP-5.6

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6c5831aa09a85b069dfc0c9360547f960fb701e2

Log:
...

Changed paths:
  M  web-bootstrap.php


Diff:
diff --git a/web-bootstrap.php b/web-bootstrap.php
index fdb40f9..e6bea6b 100644
--- a/web-bootstrap.php
+++ b/web-bootstrap.php
@@ -31,14 +31,14 @@ $_SERVER = array
   'SERVER_NAME' => 'localhost',
   'SERVER_ADDR' => '127.0.0.1',
   'SERVER_PORT' => '80',
-  'REMOTE_ADDR' => '128.0.0.1',
-  'DOCUMENT_ROOT' => dirname(__FILE__),
+  'REMOTE_ADDR' => '127.0.0.1',
+  'DOCUMENT_ROOT' => PHPDBG_BOOTPATH,
   'REQUEST_SCHEME' => 'http',
   'CONTEXT_PREFIX' => '',
-  'CONTEXT_DOCUMENT_ROOT' => dirname(__FILE__),
+  'CONTEXT_DOCUMENT_ROOT' => PHPDBG_BOOTPATH,
   'SERVER_ADMIN' => '[no address given]',
   'SCRIPT_FILENAME' => sprintf(
-'%s/%s', dirname(__FILE__), PHPDBG_BOOTSTRAP
+'%s/%s', PHPDBG_BOOTPATH, PHPDBG_BOOTSTRAP
   ),
   'REMOTE_PORT' => '47931',
   'GATEWAY_INTERFACE' => 'CGI/1.1',


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: ...: web-bootstrap.php

[Bob Weinand]

Commit:ff4c0c9397d7435ab8462fedd3e89fe2c9e3c4d4
Author:krakjoe  Tue, 12 Nov 2013 07:09:07 
+
Parents:   6c5831aa09a85b069dfc0c9360547f960fb701e2
Branches:  PHP-5.6

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ff4c0c9397d7435ab8462fedd3e89fe2c9e3c4d4

Log:
...

Changed paths:
  M  web-bootstrap.php


Diff:
diff --git a/web-bootstrap.php b/web-bootstrap.php
index e6bea6b..d50e1ea 100644
--- a/web-bootstrap.php
+++ b/web-bootstrap.php
@@ -8,9 +8,13 @@
  * break ...
  * run
  */
-define("PHPDBG_BOOTPATH", "/opt/php-zts/htdocs");
-define("PHPDBG_BOOTSTRAP", "index.php");
-define("PHPDBG_BOOTSTRAPPED", sprintf("/%s", PHPDBG_BOOTSTRAP));
+if (!defined('PHPDBG_BOOTSTRAPPED')) 
+{
+/* define these once */
+define("PHPDBG_BOOTPATH", "/opt/php-zts/htdocs");
+define("PHPDBG_BOOTSTRAP", "index.php");
+define("PHPDBG_BOOTSTRAPPED", sprintf("/%s", PHPDBG_BOOTSTRAP)); 
+}
 
 /*
  * Superglobals are JIT, phpdbg will not over-write whatever you set during 
bootstrap


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php