mirror of
https://github.com/php/php-src.git
synced 2024-11-23 09:54:15 +08:00
11accb5cdf
* Include from build dir first
This fixes out of tree builds by ensuring that configure artifacts are included
from the build dir.
Before, out of tree builds would preferably include files from the src dir, as
the include path was defined as follows (ignoring includes from ext/ and sapi/) :
-I$(top_builddir)/main
-I$(top_srcdir)
-I$(top_builddir)/TSRM
-I$(top_builddir)/Zend
-I$(top_srcdir)/main
-I$(top_srcdir)/Zend
-I$(top_srcdir)/TSRM
-I$(top_builddir)/
As a result, an out of tree build would include configure artifacts such as
`main/php_config.h` from the src dir.
After this change, the include path is defined as follows:
-I$(top_builddir)/main
-I$(top_builddir)
-I$(top_srcdir)/main
-I$(top_srcdir)
-I$(top_builddir)/TSRM
-I$(top_builddir)/Zend
-I$(top_srcdir)/Zend
-I$(top_srcdir)/TSRM
* Fix extension include path for out of tree builds
* Include config.h with the brackets form
`#include "config.h"` searches in the directory containing the including-file
before any other include path. This can include the wrong config.h when building
out of tree and a config.h exists in the source tree.
Using `#include <config.h>` uses exclusively the include path, and gives
priority to the build dir.
107 lines
3.2 KiB
C
107 lines
3.2 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) The PHP Group |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| https://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Christian Stocker <chregu@php.net> |
|
|
| Rob Richards <rrichards@php.net> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include "php.h"
|
|
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
|
|
#include "php_dom.h"
|
|
|
|
/*
|
|
* class DOMException
|
|
*
|
|
* URL: https://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-17189187
|
|
* Since:
|
|
*/
|
|
|
|
void php_dom_throw_error_with_message(dom_exception_code error_code, const char *error_message, bool strict_error) /* {{{ */
|
|
{
|
|
if (strict_error) {
|
|
zend_throw_exception(dom_domexception_class_entry, error_message, error_code);
|
|
} else {
|
|
php_libxml_issue_error(E_WARNING, error_message);
|
|
}
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ php_dom_throw_error */
|
|
void php_dom_throw_error(dom_exception_code error_code, bool strict_error)
|
|
{
|
|
const char *error_message;
|
|
|
|
switch (error_code)
|
|
{
|
|
case INDEX_SIZE_ERR:
|
|
error_message = "Index Size Error";
|
|
break;
|
|
case DOMSTRING_SIZE_ERR:
|
|
error_message = "DOM String Size Error";
|
|
break;
|
|
case HIERARCHY_REQUEST_ERR:
|
|
error_message = "Hierarchy Request Error";
|
|
break;
|
|
case WRONG_DOCUMENT_ERR:
|
|
error_message = "Wrong Document Error";
|
|
break;
|
|
case INVALID_CHARACTER_ERR:
|
|
error_message = "Invalid Character Error";
|
|
break;
|
|
case NO_DATA_ALLOWED_ERR:
|
|
error_message = "No Data Allowed Error";
|
|
break;
|
|
case NO_MODIFICATION_ALLOWED_ERR:
|
|
error_message = "No Modification Allowed Error";
|
|
break;
|
|
case NOT_FOUND_ERR:
|
|
error_message = "Not Found Error";
|
|
break;
|
|
case NOT_SUPPORTED_ERR:
|
|
error_message = "Not Supported Error";
|
|
break;
|
|
case INUSE_ATTRIBUTE_ERR:
|
|
error_message = "Inuse Attribute Error";
|
|
break;
|
|
case INVALID_STATE_ERR:
|
|
error_message = "Invalid State Error";
|
|
break;
|
|
case SYNTAX_ERR:
|
|
error_message = "Syntax Error";
|
|
break;
|
|
case INVALID_MODIFICATION_ERR:
|
|
error_message = "Invalid Modification Error";
|
|
break;
|
|
case NAMESPACE_ERR:
|
|
error_message = "Namespace Error";
|
|
break;
|
|
case INVALID_ACCESS_ERR:
|
|
error_message = "Invalid Access Error";
|
|
break;
|
|
case VALIDATION_ERR:
|
|
error_message = "Validation Error";
|
|
break;
|
|
default:
|
|
error_message = "Unhandled Error";
|
|
}
|
|
|
|
php_dom_throw_error_with_message(error_code, error_message, strict_error);
|
|
}
|
|
/* }}} end php_dom_throw_error */
|
|
|
|
#endif /* HAVE_LIBXML && HAVE_DOM */
|