More fix for the EOP chunk

diff --git a/application/hub/main/class_BaseHubSystem.php b/application/hub/main/class_BaseHubSystem.php
index 845daef6b8b50cc9d43c0af62a3287a1f01ca138..978f6922c2d5deda4ac932c269860b0656135b5e 100644 (file)
--- a/application/hub/main/class_BaseHubSystem.php
+++ b/application/hub/main/class_BaseHubSystem.php
@@ -290,6 +290,7 @@ class BaseHubSystem extends BaseFrameworkSystem {
                $chunkSplits = explode(PackageFragmenter::CHUNK_DATA_HASH_SEPARATOR, $chunks[count($chunks) - 1]);
 
                // Make sure chunks with only 3 elements are parsed (for details see ChunkHandler)
+               //* NOISY-DEBUG: */ $this->debugOutput('eopChunk=' . $chunks[count($chunks) - 1] . ',chunkSplits=' . print_r($chunkSplits,true));
                assert(count($chunkSplits) == 3);
 
                // Validate final chunk

diff --git a/application/hub/main/package/assembler/class_PackageAssembler.php b/application/hub/main/package/assembler/class_PackageAssembler.php
index f90f81c7a88fc311a109fb88082788640d84afb4..e518008aeeef57668d11e0dcd96cb10886df01db 100644 (file)
--- a/application/hub/main/package/assembler/class_PackageAssembler.php
+++ b/application/hub/main/package/assembler/class_PackageAssembler.php
@@ -97,6 +97,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable
                 * their checksums. Also the final chunk must be handled.
                 */
                $chunks = explode(PackageFragmenter::CHUNK_SEPARATOR, $packageContent[BaseRawDataHandler::PACKAGE_DECODED_DATA]);
+               //* NOISY-DEBUG */ $this->debugOutput('chunks='.print_r($chunks,true));
 
                // Validate final chunk
                if (!$this->isValidFinalChunk($chunks)) {

diff --git a/application/hub/main/package/fragmenter/class_PackageFragmenter.php b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
index a7fee59b3108128adb09f9dad55f1f21dceae3c8..622e56f34cdf1ccc391a5ab3742b45144ee1c6a8 100644 (file)
--- a/application/hub/main/package/fragmenter/class_PackageFragmenter.php
+++ b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
@@ -317,7 +317,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
                $chunkData =
                        self::END_OF_PACKAGE_IDENTIFIER .
                        $finalHash . self::CHUNK_HASH_SEPARATOR .
-                       $chunkHash . self::CHUNK_SEPARATOR;
+                       $chunkHash;
 
                // Add it as regular chunk
                $this->addChunkData($finalHash, $chunkData);
@@ -382,7 +382,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
                assert(strlen($rawData) <= NetworkPackage::TCP_PACKAGE_SIZE);
 
                // Add it to the array
-               //* NOISY-DEBUG: */ $this->debugOutput('FRAGMENTER: Adding ' . strlen($rawData) . ' bytes of a chunk.');
+               /* NOISY-DEBUG: */ $this->debugOutput('FRAGMENTER: Adding ' . strlen($rawData) . ' bytes of a chunk ...');
                $this->chunks[$finalHash][]      = $rawData;
                $this->chunkHashes[$finalHash][] = $rawDataHash;
        }