Changeset 21410 for branches/version-2_11-dev/data/module/SOAP/Fault.php

Timestamp:

2012/01/17 16:32:25 (12 years ago)

Author:

Seasoft

Message:

2.12系へマイルストーン変更となったチケット分を差し戻し
r21326 #1536
r21325 #1528
r21324 #1547,#1546
r21323 #1546
r21322 #1543
r21321 #1536
r21320 #1536
r21319 #1544
r21318 #1521,#1522
r21317 #1431

File:

• branches/version-2_11-dev/data/module/SOAP/Fault.php (modified) (3 diffs)

branches/version-2_11-dev/data/module/SOAP/Fault.php

@@ -24 +24 @@
  */
 
-/** PEAR_Error */
 require_once 'PEAR.php';
 
@@ -30 +29 @@
  * PEAR::Error wrapper used to match SOAP Faults to PEAR Errors
  *
- * SOAP_Fault can provide a complete backtrace of the error.  Revealing these
- * details in a public web services is a bad idea because it can be used by
- * attackers.  Thus you have to enable backtrace information in SOAP_Fault
- * responses by putting the following code in your script after your
- * "require_once 'SOAP/Server.php';" line:
+ * SOAP_Fault transmissions normally contain a complete backtrace of the
+ * error.  Revealing these details in a public web services is a bad idea
+ * because it can be used by attackers.  Backtrace information can be kept out
+ * of SOAP_Fault responses by putting the following code in your script after
+ * your "require_once 'SOAP/Server.php';" line:
  *
  * <code>
- * $backtrace =& PEAR::getStaticProperty('SOAP_Fault', 'backtrace');
- * $backtrace = true;
+ * $skiptrace =& PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
+ * $skiptrace = true;
  * </code>
  *
@@ -77 +76 @@
         $msg = new SOAP_Base();
         $params = array();
-        $params[] = new SOAP_Value('faultcode', 'QName', SOAP_BASE::SOAPENVPrefix().':' . $this->code);
+        $params[] = new SOAP_Value('faultcode', 'QName', 'SOAP-ENV:' . $this->code);
         $params[] = new SOAP_Value('faultstring', 'string', $this->message);
         $params[] = new SOAP_Value('faultactor', 'anyURI', $this->error_message_prefix);
-        if (PEAR::getStaticProperty('SOAP_Fault', 'backtrace') &&
-            isset($this->backtrace)) {
+        if (isset($this->backtrace)) {
             $params[] = new SOAP_Value('detail', 'string', $this->backtrace);
         } else {