push a load of changes before holidays

[m6w6/ext-http] / php_http_exception.c

diff --git a/php_http_exception.c b/php_http_exception.c
index da657ac9b8d357dbc419cd418e1de338a540dbf2..e132df7480d853dd14a69e9f0ce5a81b03989c16 100644 (file)
--- a/php_http_exception.c
+++ b/php_http_exception.c
@@ -27,10 +27,13 @@ zend_class_entry *PHP_HTTP_EX_CE(malformed_headers);
 zend_class_entry *PHP_HTTP_EX_CE(request_method);
 zend_class_entry *PHP_HTTP_EX_CE(message);
 zend_class_entry *PHP_HTTP_EX_CE(message_type);
+zend_class_entry *PHP_HTTP_EX_CE(message_body);
 zend_class_entry *PHP_HTTP_EX_CE(invalid_param);
 zend_class_entry *PHP_HTTP_EX_CE(encoding);
 zend_class_entry *PHP_HTTP_EX_CE(request);
 zend_class_entry *PHP_HTTP_EX_CE(request_pool);
+zend_class_entry *PHP_HTTP_EX_CE(request_datashare);
+zend_class_entry *PHP_HTTP_EX_CE(request_factory);
 zend_class_entry *PHP_HTTP_EX_CE(socket);
 zend_class_entry *PHP_HTTP_EX_CE(response);
 zend_class_entry *PHP_HTTP_EX_CE(url);
@@ -64,12 +67,15 @@ PHP_MINIT_FUNCTION(http_exception)
        PHP_HTTP_REGISTER_EXCEPTION(RequestMethodException, PHP_HTTP_EX_CE(request_method), PHP_HTTP_EX_DEF_CE);
        PHP_HTTP_REGISTER_EXCEPTION(MessageException, PHP_HTTP_EX_CE(message), PHP_HTTP_EX_DEF_CE);
        PHP_HTTP_REGISTER_EXCEPTION(MessageTypeException, PHP_HTTP_EX_CE(message_type), PHP_HTTP_EX_DEF_CE);
+       PHP_HTTP_REGISTER_EXCEPTION(MessageBodyException, PHP_HTTP_EX_CE(message_body), PHP_HTTP_EX_DEF_CE);
        PHP_HTTP_REGISTER_EXCEPTION(EncodingException, PHP_HTTP_EX_CE(encoding), PHP_HTTP_EX_DEF_CE);
        PHP_HTTP_REGISTER_EXCEPTION(RequestException, PHP_HTTP_EX_CE(request), PHP_HTTP_EX_DEF_CE);
 
        zend_declare_property_long(PHP_HTTP_EX_CE(request), "curlCode", lenof("curlCode"), 0, ZEND_ACC_PUBLIC TSRMLS_CC);
 
        PHP_HTTP_REGISTER_EXCEPTION(RequestPoolException, PHP_HTTP_EX_CE(request_pool), PHP_HTTP_EX_DEF_CE);
+       PHP_HTTP_REGISTER_EXCEPTION(RequestDataShareException, PHP_HTTP_EX_CE(request_datashare), PHP_HTTP_EX_DEF_CE);
+       PHP_HTTP_REGISTER_EXCEPTION(RequestFactoryException, PHP_HTTP_EX_CE(request_factory), PHP_HTTP_EX_DEF_CE);
        PHP_HTTP_REGISTER_EXCEPTION(SocketException, PHP_HTTP_EX_CE(socket), PHP_HTTP_EX_DEF_CE);
        PHP_HTTP_REGISTER_EXCEPTION(ResponseException, PHP_HTTP_EX_CE(response), PHP_HTTP_EX_DEF_CE);
        PHP_HTTP_REGISTER_EXCEPTION(UrlException, PHP_HTTP_EX_CE(url), PHP_HTTP_EX_DEF_CE);
@@ -100,9 +106,12 @@ zend_class_entry *php_http_exception_get_for_code(long code)
                case PHP_HTTP_E_REQUEST_METHOD:                         ex = PHP_HTTP_EX_CE(request_method);                    break;
                case PHP_HTTP_E_MESSAGE:                                        ex = PHP_HTTP_EX_CE(message);                                   break;
                case PHP_HTTP_E_MESSAGE_TYPE:                           ex = PHP_HTTP_EX_CE(message_type);                              break;
+               case PHP_HTTP_E_MESSAGE_BODY:                           ex = PHP_HTTP_EX_CE(message_body);                              break;
                case PHP_HTTP_E_ENCODING:                                       ex = PHP_HTTP_EX_CE(encoding);                                  break;
                case PHP_HTTP_E_REQUEST:                                        ex = PHP_HTTP_EX_CE(request);                                   break;
                case PHP_HTTP_E_REQUEST_POOL:                           ex = PHP_HTTP_EX_CE(request_pool);                              break;
+               case PHP_HTTP_E_REQUEST_DATASHARE:                      ex = PHP_HTTP_EX_CE(request_datashare);                 break;
+               case PHP_HTTP_E_REQUEST_FACTORY:                        ex = PHP_HTTP_EX_CE(request_factory);                   break;
                case PHP_HTTP_E_SOCKET:                                         ex = PHP_HTTP_EX_CE(socket);                                    break;
                case PHP_HTTP_E_RESPONSE:                                       ex = PHP_HTTP_EX_CE(response);                                  break;
                case PHP_HTTP_E_URL:                                            ex = PHP_HTTP_EX_CE(url);                                               break;