Merge branch 'str_size_and_int64' of https://github.com/weltling/php-src into str_size_and_int64

Conflicts:
	NEWS
	UPGRADING
	UPGRADING.INTERNALS
	Zend/zend_API.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.h
	Zend/zend_exceptions.c
	Zend/zend_exceptions.h
	Zend/zend_execute.c
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
	Zend/zend_operators.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/lib/parse_date.c
	ext/date/php_date.c
	ext/imap/config.m4
	ext/oci8/config.m4
	ext/oci8/oci8.c
	ext/oci8/oci8_dtrace.d
	ext/oci8/oci8_interface.c
	ext/oci8/oci8_lob.c
	ext/oci8/oci8_statement.c
	ext/oci8/package.xml
	ext/oci8/php_oci8.h
	ext/reflection/php_reflection.c
	ext/spl/spl_directory.c
	ext/spl/spl_fixedarray.c
	ext/standard/file.c
	ext/standard/http_fopen_wrapper.c
	ext/standard/info.c
	ext/standard/string.c
	main/php_variables.c
	main/streams/streams.c

Author: weltling

Zend/zend_exceptions.c

@@ -86,7 +86,7 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
 #ifdef HAVE_DTRACE
 	if (DTRACE_EXCEPTION_THROWN_ENABLED()) {
 		const char *classname;
-		zend_str_size name_len;
+		zend_str_size_uint name_len;
 
 		if (exception != NULL) {
 			zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC);

Zend/zend_exceptions.h

@@ -54,7 +54,7 @@ ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC);
 
 /* do not export, in php it's available thru spprintf directly */
 zend_str_size_int zend_spprintf(char **message, zend_str_size_int max_len, const char *format, ...);
-
+=======
 END_EXTERN_C()
 
 #endif