ObjXMPP  Check-in [ad6f1107ce]

Overview
Comment:Comments and PIs are not allowed in XMPP -> throw an exception.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: ad6f1107cef60646f20bd0368abf4bf3429673a04b1e68e2858866c07111b869
User & Date: js on 2012-02-03 14:35:28
Other Links: manifest | tags
Context
2012-02-03
14:36
Update Xcode project. check-in: 9731fdfde0 user: js tags: trunk
14:35
Comments and PIs are not allowed in XMPP -> throw an exception. check-in: ad6f1107ce user: js tags: trunk
10:54
Allow IDNs for server and not only domain. check-in: 3ae82f03d8 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/Makefile from [91e4f33c74] to [b6f2c72ef0].

︙
16
17
18
19
20
21
22
23


24
25
26
27
28
29
30

16
17
18
19
20
21
22

23
24
25
26
27
28
29
30
31








-
+
+








       XMPPMulticastDelegate.m	\
       XMPPPLAINAuth.m		\
       XMPPPresence.m		\
       XMPPRoster.m		\
       XMPPRosterItem.m		\
       XMPPSCRAMAuth.m		\
       XMPPSRVLookup.m		\
       XMPPStanza.m
       XMPPStanza.m		\
       XMPPXMLElementBuilder.m

INCLUDES = ${SRCS:.m=.h}	\
	   namespaces.h		\
	   ObjXMPP.h

include ../buildsys.mk
︙

Modified src/XMPPConnection.m from [381c679903] to [b72bf77860].

︙
498
499
500
501
502
503
504
505
506
507
508




509
510
511
512
513
514
515

498
499
500
501
502
503
504




505
506
507
508
509
510
511
512
513
514
515








-
-
-
-
+
+
+
+








	if ([[element namespace] isEqual: XMPP_NS_STARTTLS])
		[self XMPP_handleTLS: element];

	if ([[element namespace] isEqual: XMPP_NS_SASL])
		[self XMPP_handleSASL: element];
}

- (void)elementBuilder: (OFXMLElementBuilder *)builder
  didNotExpectCloseTag: (OFString *)name
	    withPrefix: (OFString *)prefix
	     namespace: (OFString *)ns
- (void)elementBuilder: (OFXMLElementBuilder*)builder
  didNotExpectCloseTag: (OFString*)name
	    withPrefix: (OFString*)prefix
	     namespace: (OFString*)ns
{
	if (![name isEqual: @"stream"] || ![prefix isEqual: @"stream"] ||
	    ![ns isEqual: XMPP_NS_STREAM])
		@throw [OFMalformedXMLException
		    exceptionWithClass: [builder class]
				parser: nil];
	else {
︙
529
530
531
532
533
534
535
536

537
538
539
540
541
542
543

529
530
531
532
533
534
535

536
537
538
539
540
541
542
543








-
+








	 */
	oldParser = parser;
	oldElementBuilder = elementBuilder;

	parser = [[OFXMLParser alloc] init];
	[parser setDelegate: self];

	elementBuilder = [[OFXMLElementBuilder alloc] init];
	elementBuilder = [[XMPPXMLElementBuilder alloc] init];
	[elementBuilder setDelegate: self];

	[sock writeFormat: @"<?xml version='1.0'?>\n"
			   @"<stream:stream to='%@' "
			   @"xmlns='" XMPP_NS_CLIENT @"' "
			   @"xmlns:stream='" XMPP_NS_STREAM @"' "
			   @"version='1.0'>", domain];
︙

Added src/XMPPXMLElementBuilder.h version [85a881b0de].

Added src/XMPPXMLElementBuilder.m version [679026d6a1].