Skip to content

Commit 9f89ada

Browse files
authored
Struct-pack some soap datatypes (#14403)
While keeping data that belongs together close too.
1 parent 1e2306b commit 9f89ada

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/soap/php_sdl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ typedef struct _sdlSoapBindingFunctionHeader {
9494
char *name;
9595
char *ns;
9696
sdlEncodingUse use;
97+
sdlRpcEncodingStyle encodingStyle; /* not implemented yet */
9798
sdlTypePtr element;
9899
encodePtr encode;
99-
sdlRpcEncodingStyle encodingStyle; /* not implemented yet */
100100
HashTable *headerfaults; /* array of sdlSoapBindingFunctionHeaderPtr */
101101
} sdlSoapBindingFunctionHeader, *sdlSoapBindingFunctionHeaderPtr;
102102

@@ -195,9 +195,9 @@ typedef enum _sdlForm {
195195

196196
struct _sdlType {
197197
sdlTypeKind kind;
198+
char nillable;
198199
char *name;
199200
char *namens;
200-
char nillable;
201201
HashTable *elements; /* array of sdlTypePtr */
202202
HashTable *attributes; /* array of sdlAttributePtr */
203203
sdlRestrictionsPtr restrictions;

ext/soap/php_soap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ struct _soapService {
9898
xmlCharEncodingHandlerPtr encoding;
9999
zval class_map;
100100
int features;
101+
int send_errors;
101102
struct _soapHeader **soap_headers_ptr;
102-
int send_errors;
103103
};
104104

105105
#define SOAP_CLASS 1
@@ -157,9 +157,9 @@ ZEND_BEGIN_MODULE_GLOBALS(soap)
157157
int cur_uniq_ns;
158158
int soap_version;
159159
sdlPtr sdl;
160-
bool use_soap_error_handler;
161160
char* error_code;
162161
zval error_object;
162+
bool use_soap_error_handler;
163163
char cache;
164164
char cache_mode;
165165
char cache_enabled;

0 commit comments

Comments
 (0)